mirror of
https://git.yoctoproject.org/poky
synced 2026-09-14 21:49:33 +02:00
python3: remove two setup.py cross-compile hacks
Remove two unneeded hacks. The first hack ("setup.py: no host headers
libs" patch) is not needed because we use cross-compiler (e.g.
i586-oe-linux-gcc) which has not been configured with any host system
include or library directories, and thus, we don't get any host system
directories when running "gcc -E -v".
The second hack becomes useless after the first hack has been removed
and we get the standard include and lib directories normally from gcc.
(From OE-Core rev: 9e9545ef818adfb57f428db96d4c2ebb0ea65ec6)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
84f4010a83
commit
ae8d879006
@@ -1,33 +0,0 @@
|
|||||||
From 43238e1ac13e32984d015c92a5841f3de1fe1d15 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jackie Huang <jackie.huang@windriver.com>
|
|
||||||
Date: Tue, 18 Nov 2014 00:07:07 -0500
|
|
||||||
Subject: [PATCH] setup.py: no host headers libs
|
|
||||||
|
|
||||||
When we are cross-compiling, setup.py should never look in /usr
|
|
||||||
or /usr/local to find headers or libraries.
|
|
||||||
|
|
||||||
Upstream-Status: Inappropriate [Cross compile specific]
|
|
||||||
|
|
||||||
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
|
|
||||||
---
|
|
||||||
setup.py | 3 ---
|
|
||||||
1 file changed, 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/setup.py b/setup.py
|
|
||||||
index f020b28..e8339cd 100644
|
|
||||||
--- a/setup.py
|
|
||||||
+++ b/setup.py
|
|
||||||
@@ -444,10 +444,7 @@ class PyBuildExt(build_ext):
|
|
||||||
if not cross_compiling:
|
|
||||||
add_dir_to_list(self.compiler.library_dirs, os.path.join('/usr/local', sys.lib))
|
|
||||||
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
|
|
||||||
- # only change this for cross builds for 3.3, issues on Mageia
|
|
||||||
- if cross_compiling:
|
|
||||||
self.add_gcc_paths()
|
|
||||||
- if not cross_compiling:
|
|
||||||
self.add_multiarch_paths()
|
|
||||||
|
|
||||||
# Add paths specified in the environment variables LDFLAGS and
|
|
||||||
--
|
|
||||||
2.0.0
|
|
||||||
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
Patch setup.py so that the detect_modules() function looks for required
|
|
||||||
libraries and headers in STAGING_LIBDIR / STAGING_INCDIR.
|
|
||||||
|
|
||||||
Without this patch, several extension modules are not built, even though
|
|
||||||
their dependencies are present in the compiler's search paths.
|
|
||||||
The result is the following warning, and ultimately incomplete packages:
|
|
||||||
|
|
||||||
| The necessary bits to build these optional modules were not found:
|
|
||||||
| _bz2 _curses_panel _dbm
|
|
||||||
| _gdbm _lzma _sqlite3
|
|
||||||
| nis readline zlib
|
|
||||||
| To find the necessary bits, look in setup.py in detect_modules() for the module's name.
|
|
||||||
|
|
||||||
Upstream-Status: Inappropriate [Cross compile specific]
|
|
||||||
|
|
||||||
Signed-off-by: Dominic Sacré <dominic.sacre@gmx.de>
|
|
||||||
|
|
||||||
Index: Python-3.4.3/setup.py
|
|
||||||
===================================================================
|
|
||||||
--- Python-3.4.3.orig/setup.py
|
|
||||||
+++ Python-3.4.3/setup.py
|
|
||||||
@@ -521,6 +521,8 @@ class PyBuildExt(build_ext):
|
|
||||||
else:
|
|
||||||
lib_dirs = self.compiler.library_dirs[:]
|
|
||||||
inc_dirs = self.compiler.include_dirs[:]
|
|
||||||
+ lib_dirs.append(os.environ.get('STAGING_LIBDIR'))
|
|
||||||
+ inc_dirs.append(os.environ.get('STAGING_INCDIR'))
|
|
||||||
exts = []
|
|
||||||
missing = []
|
|
||||||
|
|
||||||
@@ -31,10 +31,8 @@ SRC_URI += "\
|
|||||||
file://unixccompiler.patch \
|
file://unixccompiler.patch \
|
||||||
file://avoid-ncursesw-include-path.patch \
|
file://avoid-ncursesw-include-path.patch \
|
||||||
file://python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch \
|
file://python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch \
|
||||||
file://python3-setup.py-no-host-headers-libs.patch \
|
|
||||||
file://sysconfig.py-add-_PYTHON_PROJECT_SRC.patch \
|
file://sysconfig.py-add-_PYTHON_PROJECT_SRC.patch \
|
||||||
file://setup.py-check-cross_compiling-when-get-FLAGS.patch \
|
file://setup.py-check-cross_compiling-when-get-FLAGS.patch \
|
||||||
file://setup.py-find-libraries-in-staging-dirs.patch \
|
|
||||||
file://configure.ac-fix-LIBPL.patch \
|
file://configure.ac-fix-LIBPL.patch \
|
||||||
file://upstream-random-fixes.patch \
|
file://upstream-random-fixes.patch \
|
||||||
file://0001-Issue-21272-Use-_sysconfigdata.py-to-initialize-dist.patch \
|
file://0001-Issue-21272-Use-_sysconfigdata.py-to-initialize-dist.patch \
|
||||||
|
|||||||
Reference in New Issue
Block a user