summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python/host_include_contamination.patch
diff options
context:
space:
mode:
authorAlejandro Hernandez <alejandro.hernandez@linux.intel.com>2015-02-11 17:57:49 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-23 17:35:29 +0000
commitcb02ecb507ddad3cb17c78020b42c004aa2903ae (patch)
tree0f30353b3c8a3aaf6294f8db9c8fb7cff5575ab9 /meta/recipes-devtools/python/python/host_include_contamination.patch
parent122ee11bd1817f776336e54898cb36162fe527df (diff)
downloadpoky-cb02ecb507ddad3cb17c78020b42c004aa2903ae.tar.gz
Python: Upgrade from 2.7.3 to 2.7.9:
- Based on Paul Eggletons work to partially upgrade to Python 2.7.6 Modified: default-versions.inc: switched to python 2.7.9 generate-manifest-2.7.py: fixed _sysconfigdata python-2.7-manifest.inc: fixed _sysconfigdata python.inc: Updated checksums and source, no LICENSE change just updated some dates python-native_2.7.3 -> python-native_2.7.9 and updated patches python_2.7.3 -> python_2.7.9, and added ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no in EXTRA_OECONF to solve python issue #3754, only needed when cross compiling, also updated patches use_sysroot_ncurses_instead_of_host.patch: New patch to use ncursesw from sysroot instead of hosts, introduced by fix for python issue #15268 Rebased: 01-use-proper-tools-for-cross-build.patch 03-fix-tkinter-detection.patch 05-enable-ctypes-cross-build.patch 06-avoid_usr_lib_termcap_path_in_linking.patch avoid_warning_about_tkinter.patch builddir.patch fix_for_using_different_libdir.patch host_include_contamination.patch multilib.patch nohostlibs.patch search_db_h_in_inc_dirs_and_avoid_warning.patch Deleted (fixed on upstream): 06-ctypes-libffi-fix-configure.patch CVE-2013-4073_py27.patch gcc-4.8-fix-configure-Wformat.patch json-flaw-fix.patch posix_close.patch pypirc-secure.patch python-2.7.3-CVE-2012-2135.patch python-2.7.3-CVE-2013-1752-smtplib-fix.patch python-2.7.3-CVE-2014-1912.patch python-2.7.3-CVE-2014-7185.patch python-2.7.3-berkeley-db-5.3.patch python-fix-build-error-with-Readline-6.3.patch remove-BOM-insection-code.patch remove_sqlite_rpath.patch python2.7.3-nossl3.patch [YOCTO #7059] (From OE-Core rev: d4ad95f0d5f08891637c644e85b09da9c4585059) Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python/host_include_contamination.patch')
-rw-r--r--meta/recipes-devtools/python/python/host_include_contamination.patch23
1 files changed, 12 insertions, 11 deletions
diff --git a/meta/recipes-devtools/python/python/host_include_contamination.patch b/meta/recipes-devtools/python/python/host_include_contamination.patch
index 62cb8b16da..e0aafb218b 100644
--- a/meta/recipes-devtools/python/python/host_include_contamination.patch
+++ b/meta/recipes-devtools/python/python/host_include_contamination.patch
@@ -12,16 +12,17 @@ so we add a check here.
12Signed-off-by: Khem Raj <raj.khem@gmail.com> 12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13Upstream-Status: Pending 13Upstream-Status: Pending
14 14
15Index: Python-2.7.2/setup.py 15
16=================================================================== 16diff --git a/setup.py b/setup.py
17--- Python-2.7.2.orig/setup.py 2012-02-03 12:10:42.307057756 -0800 17index ba2d242..bf859be 100644
18+++ Python-2.7.2/setup.py 2012-02-03 12:11:12.363059210 -0800 18--- a/setup.py
19@@ -360,6 +360,8 @@ 19+++ b/setup.py
20 # https://wiki.ubuntu.com/MultiarchSpec 20@@ -393,6 +393,8 @@ class PyBuildExt(build_ext):
21
21 if not find_executable('dpkg-architecture'): 22 if not find_executable('dpkg-architecture'):
22 return 23 return
23+ if os.environ.get('CROSS_COMPILE') is not None: 24+ if os.environ.get('CROSS_COMPILE') is not None:
24+ return 25+ return
25 tmpfile = os.path.join(self.build_temp, 'multiarch') 26 opt = ''
26 if not os.path.exists(self.build_temp): 27 if cross_compiling:
27 os.makedirs(self.build_temp) 28 opt = '-t' + sysconfig.get_config_var('HOST_GNU_TYPE')