diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2017-11-20 14:15:32 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-02 11:25:32 +0000 |
| commit | ae8d879006064f0a8bf6f26332bf5ef922a64e5c (patch) | |
| tree | 5d6d23b13ef543993c7f74b3c3b2977e7bf6d15d /meta/recipes-devtools/python/python3/python3-setup.py-no-host-headers-libs.patch | |
| parent | 84f4010a836ac657a80921b5c39ae9e6a763f3e1 (diff) | |
| download | poky-ae8d879006064f0a8bf6f26332bf5ef922a64e5c.tar.gz | |
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>
Diffstat (limited to 'meta/recipes-devtools/python/python3/python3-setup.py-no-host-headers-libs.patch')
| -rw-r--r-- | meta/recipes-devtools/python/python3/python3-setup.py-no-host-headers-libs.patch | 33 |
1 files changed, 0 insertions, 33 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 | |||
