From abf6ae95e46d35d5c1f36cd050bd57b83788c1e2 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Sat, 16 Sep 2017 19:24:08 +0200 Subject: python3: version bump 3.5.3 -> 3.5.4 Signed-off-by: Michael Olbrich --- ...n-t-leak-host-path-into-cross-compilation.patch | 43 ---------------------- patches/Python-3.5.3/series | 4 -- ...n-t-leak-host-path-into-cross-compilation.patch | 43 ++++++++++++++++++++++ patches/Python-3.5.4/series | 4 ++ rules/python3.make | 4 +- 5 files changed, 49 insertions(+), 49 deletions(-) delete mode 100644 patches/Python-3.5.3/0001-python3-don-t-leak-host-path-into-cross-compilation.patch delete mode 100644 patches/Python-3.5.3/series create mode 100644 patches/Python-3.5.4/0001-python3-don-t-leak-host-path-into-cross-compilation.patch create mode 100644 patches/Python-3.5.4/series diff --git a/patches/Python-3.5.3/0001-python3-don-t-leak-host-path-into-cross-compilation.patch b/patches/Python-3.5.3/0001-python3-don-t-leak-host-path-into-cross-compilation.patch deleted file mode 100644 index fbe2c312f..000000000 --- a/patches/Python-3.5.3/0001-python3-don-t-leak-host-path-into-cross-compilation.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Michael Olbrich -Date: Tue, 15 Sep 2015 15:33:58 +0200 -Subject: [PATCH] python3: don't leak host path into cross compilation - -Based on a patch by Han Sirkstra - -Signed-off-by: Michael Olbrich ---- - setup.py | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/setup.py b/setup.py -index 40f8bf20ee74..ee04dba88fa8 100644 ---- a/setup.py -+++ b/setup.py -@@ -533,7 +533,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 -@@ -1274,7 +1275,6 @@ class PyBuildExt(build_ext): - if dbm_setup_debug: print("building dbm using bdb") - dbmext = Extension('_dbm', ['_dbmmodule.c'], - library_dirs=dblib_dir, -- runtime_library_dirs=dblib_dir, - include_dirs=db_incs, - define_macros=[ - ('HAVE_BERKDB_H', None), -@@ -1323,7 +1323,8 @@ class PyBuildExt(build_ext): - panel_library = 'panel' - if curses_library == 'ncursesw': - curses_defines.append(('HAVE_NCURSESW', '1')) -- curses_includes.append('/usr/include/ncursesw') -+ if not cross_compiling: -+ curses_includes.append('/usr/include/ncursesw') - # Bug 1464056: If _curses.so links with ncursesw, - # _curses_panel.so must link with panelw. - panel_library = 'panelw' diff --git a/patches/Python-3.5.3/series b/patches/Python-3.5.3/series deleted file mode 100644 index 7f3b3d069..000000000 --- a/patches/Python-3.5.3/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-python3-don-t-leak-host-path-into-cross-compilation.patch -# 3a85778f36c3116f07c55efca7ccb1a7 - git-ptx-patches magic diff --git a/patches/Python-3.5.4/0001-python3-don-t-leak-host-path-into-cross-compilation.patch b/patches/Python-3.5.4/0001-python3-don-t-leak-host-path-into-cross-compilation.patch new file mode 100644 index 000000000..fbe2c312f --- /dev/null +++ b/patches/Python-3.5.4/0001-python3-don-t-leak-host-path-into-cross-compilation.patch @@ -0,0 +1,43 @@ +From: Michael Olbrich +Date: Tue, 15 Sep 2015 15:33:58 +0200 +Subject: [PATCH] python3: don't leak host path into cross compilation + +Based on a patch by Han Sirkstra + +Signed-off-by: Michael Olbrich +--- + setup.py | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/setup.py b/setup.py +index 40f8bf20ee74..ee04dba88fa8 100644 +--- a/setup.py ++++ b/setup.py +@@ -533,7 +533,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 +@@ -1274,7 +1275,6 @@ class PyBuildExt(build_ext): + if dbm_setup_debug: print("building dbm using bdb") + dbmext = Extension('_dbm', ['_dbmmodule.c'], + library_dirs=dblib_dir, +- runtime_library_dirs=dblib_dir, + include_dirs=db_incs, + define_macros=[ + ('HAVE_BERKDB_H', None), +@@ -1323,7 +1323,8 @@ class PyBuildExt(build_ext): + panel_library = 'panel' + if curses_library == 'ncursesw': + curses_defines.append(('HAVE_NCURSESW', '1')) +- curses_includes.append('/usr/include/ncursesw') ++ if not cross_compiling: ++ curses_includes.append('/usr/include/ncursesw') + # Bug 1464056: If _curses.so links with ncursesw, + # _curses_panel.so must link with panelw. + panel_library = 'panelw' diff --git a/patches/Python-3.5.4/series b/patches/Python-3.5.4/series new file mode 100644 index 000000000..7f3b3d069 --- /dev/null +++ b/patches/Python-3.5.4/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-python3-don-t-leak-host-path-into-cross-compilation.patch +# 3a85778f36c3116f07c55efca7ccb1a7 - git-ptx-patches magic diff --git a/rules/python3.make b/rules/python3.make index 310c6266c..ebcad5024 100644 --- a/rules/python3.make +++ b/rules/python3.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_PYTHON3) += python3 # # Paths and names # -PYTHON3_VERSION := 3.5.3 -PYTHON3_MD5 := 57d1f8bfbabf4f2500273fb0706e6f21 +PYTHON3_VERSION := 3.5.4 +PYTHON3_MD5 := fb2780baa260b4e51cbea814f111f303 PYTHON3_MAJORMINOR := $(basename $(PYTHON3_VERSION)) PYTHON3_SITEPACKAGES := /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages PYTHON3 := Python-$(PYTHON3_VERSION) -- cgit v1.2.3