diff options
3 files changed, 0 insertions, 65 deletions
diff --git a/meta/recipes-devtools/python/python3/python3-setup.py-no-host-headers-libs.patch b/meta/recipes-devtools/python/python3/python3-setup.py-no-host-headers-libs.patch deleted file mode 100644 index 2bc8b8c460..0000000000 --- a/meta/recipes-devtools/python/python3/python3-setup.py-no-host-headers-libs.patch +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | From 43238e1ac13e32984d015c92a5841f3de1fe1d15 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jackie Huang <jackie.huang@windriver.com> | ||
| 3 | Date: Tue, 18 Nov 2014 00:07:07 -0500 | ||
| 4 | Subject: [PATCH] setup.py: no host headers libs | ||
| 5 | |||
| 6 | When we are cross-compiling, setup.py should never look in /usr | ||
| 7 | or /usr/local to find headers or libraries. | ||
| 8 | |||
| 9 | Upstream-Status: Inappropriate [Cross compile specific] | ||
| 10 | |||
| 11 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
| 12 | --- | ||
| 13 | setup.py | 3 --- | ||
| 14 | 1 file changed, 3 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/setup.py b/setup.py | ||
| 17 | index f020b28..e8339cd 100644 | ||
| 18 | --- a/setup.py | ||
| 19 | +++ b/setup.py | ||
| 20 | @@ -444,10 +444,7 @@ class PyBuildExt(build_ext): | ||
| 21 | if not cross_compiling: | ||
| 22 | add_dir_to_list(self.compiler.library_dirs, os.path.join('/usr/local', sys.lib)) | ||
| 23 | add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') | ||
| 24 | - # only change this for cross builds for 3.3, issues on Mageia | ||
| 25 | - if cross_compiling: | ||
| 26 | self.add_gcc_paths() | ||
| 27 | - if not cross_compiling: | ||
| 28 | self.add_multiarch_paths() | ||
| 29 | |||
| 30 | # Add paths specified in the environment variables LDFLAGS and | ||
| 31 | -- | ||
| 32 | 2.0.0 | ||
| 33 | |||
diff --git a/meta/recipes-devtools/python/python3/setup.py-find-libraries-in-staging-dirs.patch b/meta/recipes-devtools/python/python3/setup.py-find-libraries-in-staging-dirs.patch deleted file mode 100644 index f26bd38b02..0000000000 --- a/meta/recipes-devtools/python/python3/setup.py-find-libraries-in-staging-dirs.patch +++ /dev/null | |||
| @@ -1,30 +0,0 @@ | |||
| 1 | Patch setup.py so that the detect_modules() function looks for required | ||
| 2 | libraries and headers in STAGING_LIBDIR / STAGING_INCDIR. | ||
| 3 | |||
| 4 | Without this patch, several extension modules are not built, even though | ||
| 5 | their dependencies are present in the compiler's search paths. | ||
| 6 | The result is the following warning, and ultimately incomplete packages: | ||
| 7 | |||
| 8 | | The necessary bits to build these optional modules were not found: | ||
| 9 | | _bz2 _curses_panel _dbm | ||
| 10 | | _gdbm _lzma _sqlite3 | ||
| 11 | | nis readline zlib | ||
| 12 | | To find the necessary bits, look in setup.py in detect_modules() for the module's name. | ||
| 13 | |||
| 14 | Upstream-Status: Inappropriate [Cross compile specific] | ||
| 15 | |||
| 16 | Signed-off-by: Dominic Sacré <dominic.sacre@gmx.de> | ||
| 17 | |||
| 18 | Index: Python-3.4.3/setup.py | ||
| 19 | =================================================================== | ||
| 20 | --- Python-3.4.3.orig/setup.py | ||
| 21 | +++ Python-3.4.3/setup.py | ||
| 22 | @@ -521,6 +521,8 @@ class PyBuildExt(build_ext): | ||
| 23 | else: | ||
| 24 | lib_dirs = self.compiler.library_dirs[:] | ||
| 25 | inc_dirs = self.compiler.include_dirs[:] | ||
| 26 | + lib_dirs.append(os.environ.get('STAGING_LIBDIR')) | ||
| 27 | + inc_dirs.append(os.environ.get('STAGING_INCDIR')) | ||
| 28 | exts = [] | ||
| 29 | missing = [] | ||
| 30 | |||
diff --git a/meta/recipes-devtools/python/python3_3.5.3.bb b/meta/recipes-devtools/python/python3_3.5.3.bb index 281a65f784..b70915e54f 100644 --- a/meta/recipes-devtools/python/python3_3.5.3.bb +++ b/meta/recipes-devtools/python/python3_3.5.3.bb | |||
| @@ -31,10 +31,8 @@ SRC_URI += "\ | |||
| 31 | file://unixccompiler.patch \ | 31 | file://unixccompiler.patch \ |
| 32 | file://avoid-ncursesw-include-path.patch \ | 32 | file://avoid-ncursesw-include-path.patch \ |
| 33 | file://python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch \ | 33 | file://python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch \ |
| 34 | file://python3-setup.py-no-host-headers-libs.patch \ | ||
| 35 | file://sysconfig.py-add-_PYTHON_PROJECT_SRC.patch \ | 34 | file://sysconfig.py-add-_PYTHON_PROJECT_SRC.patch \ |
| 36 | file://setup.py-check-cross_compiling-when-get-FLAGS.patch \ | 35 | file://setup.py-check-cross_compiling-when-get-FLAGS.patch \ |
| 37 | file://setup.py-find-libraries-in-staging-dirs.patch \ | ||
| 38 | file://configure.ac-fix-LIBPL.patch \ | 36 | file://configure.ac-fix-LIBPL.patch \ |
| 39 | file://upstream-random-fixes.patch \ | 37 | file://upstream-random-fixes.patch \ |
| 40 | file://0001-Issue-21272-Use-_sysconfigdata.py-to-initialize-dist.patch \ | 38 | file://0001-Issue-21272-Use-_sysconfigdata.py-to-initialize-dist.patch \ |
