python3: upgrade to version 3.6.1

Dropped patch `002-do-not-add-include-dirs-when-cross-compiling.patch`
Seems upstream also fixed it (yay).

Refreshed patch `011-fix-ncursesw-definition-colisions.patch`

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
This commit is contained in:
Alexandru Ardelean
2017-03-27 09:50:31 +03:00
parent e90b775740
commit 39680db273
4 changed files with 5 additions and 30 deletions
@@ -1,14 +0,0 @@
diff --git a/setup.py b/setup.py
index 93f390f..ace1494 100644
--- a/setup.py
+++ b/setup.py
@@ -461,7 +461,8 @@ class PyBuildExt(build_ext):
add_dir_to_list(dir_list, directory)
if os.path.normpath(sys.base_prefix) != '/usr' \
- and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
+ and not sysconfig.get_config_var('PYTHONFRAMEWORK') \
+ and not cross_compiling:
# OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
# (PYTHONFRAMEWORK is set) to avoid # linking problems when
# building a framework with different architectures than
@@ -10,15 +10,3 @@ index 3bf2ca7..c156964 100644
#ifdef __sgi
#include <term.h>
#endif
diff --git a/setup.py b/setup.py
index af9a414..ee19ecd 100644
--- a/setup.py
+++ b/setup.py
@@ -1349,7 +1349,6 @@ class PyBuildExt(build_ext):
panel_library = 'panel'
if curses_library == 'ncursesw':
curses_defines.append(('HAVE_NCURSESW', '1'))
- curses_includes.append('/usr/include/ncursesw')
# Bug 1464056: If _curses.so links with ncursesw,
# _curses_panel.so must link with panelw.
panel_library = 'panelw'