mirror of
https://git.yoctoproject.org/poky
synced 2026-02-05 16:28:43 +01:00
cb02ecb507
- 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>
29 lines
961 B
Diff
29 lines
961 B
Diff
when building python for qemux86-64 on ubuntu 11.10/64bit
|
|
it gropes into host includes and then mixes them with cross
|
|
includes and as a result some modules fail to compile and link
|
|
one of the modules is python-elementtree which is then not
|
|
found during image creation
|
|
|
|
Proble is that setup.py tries to add native includes that newer
|
|
ubuntu has introduced for multiarch support. But that should
|
|
only happen for native builds and not cross building python
|
|
so we add a check here.
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
Upstream-Status: Pending
|
|
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index ba2d242..bf859be 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -393,6 +393,8 @@ class PyBuildExt(build_ext):
|
|
|
|
if not find_executable('dpkg-architecture'):
|
|
return
|
|
+ if os.environ.get('CROSS_COMPILE') is not None:
|
|
+ return
|
|
opt = ''
|
|
if cross_compiling:
|
|
opt = '-t' + sysconfig.get_config_var('HOST_GNU_TYPE')
|