python: Fix build failure of python-elementtree on x86_64
The problem is due to mixing of headers from host system thusly corrected in setup.py by checkinng if we are cross compiling (From OE-Core rev: 25016d158af927e0c9e70c3df4674f53fa54fec8) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
7d9ac1db13
commit
fadd554603
|
@ -0,0 +1,27 @@
|
|||
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
|
||||
|
||||
Index: Python-2.7.2/setup.py
|
||||
===================================================================
|
||||
--- Python-2.7.2.orig/setup.py 2012-02-03 12:10:42.307057756 -0800
|
||||
+++ Python-2.7.2/setup.py 2012-02-03 12:11:12.363059210 -0800
|
||||
@@ -360,6 +360,8 @@
|
||||
# https://wiki.ubuntu.com/MultiarchSpec
|
||||
if not find_executable('dpkg-architecture'):
|
||||
return
|
||||
+ if os.environ.get('CROSS_COMPILE') is not None:
|
||||
+ return
|
||||
tmpfile = os.path.join(self.build_temp, 'multiarch')
|
||||
if not os.path.exists(self.build_temp):
|
||||
os.makedirs(self.build_temp)
|
|
@ -1,7 +1,7 @@
|
|||
require python.inc
|
||||
DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib"
|
||||
DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
|
||||
PR = "${INC_PR}.5"
|
||||
PR = "${INC_PR}.6"
|
||||
|
||||
DISTRO_SRC_URI ?= "file://sitecustomize.py"
|
||||
DISTRO_SRC_URI_linuxstdbase = ""
|
||||
|
@ -20,6 +20,7 @@ SRC_URI += "\
|
|||
file://remove_sqlite_rpath.patch \
|
||||
file://setup_py_skip_cross_import_check.patch \
|
||||
file://add-md5module-support.patch \
|
||||
file://host_include_contamination.patch \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}/Python-${PV}"
|
||||
|
|
Loading…
Reference in New Issue