python: skip setup.py 'import check' when cross-compiling
build_extension() in setup.py, as part of the build process, does an 'import check' on the built extension. The import check in turn dlopen()'s the shared library associated with the extension, which isn't something that makes sense if that library was cross-compiled for a different architecture. This was noticed with an x86_64 target that was compiled with avx support, because it caused 'illegal instruction' exceptions: | /bin/sh: line 1: 14575 Illegal instruction ... -E ./setup.py -q build For other target architectures, it doesn't necessarily cause illegal instruction exceptions, but still fails. For example, on arm, the failure pathway causes this warning: *** WARNING: renaming "cmath" since importing it failed: .../cmath.so: wrong ELF class: ELFCLASS32 This patch to setup.py and the associated recipe changes allow the whole 'import check' logic to be skipped when cross-compiling. (From OE-Core rev: 25fae81538a92e15eab3fc169ebce44505f67839) (From OE-Core rev: d83e4ac25cca788d2b102c2072ccb367c0cab284) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
38978dc0b8
commit
ccf6077d4e
|
@ -0,0 +1,27 @@
|
|||
This patch skips over the 'import check' setup.py does when building
|
||||
extensions. This generally won't work when cross-compiling.
|
||||
|
||||
Upstream-Status: Inappropriate [embedded-specific]
|
||||
|
||||
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
|
||||
|
||||
Index: Python-2.7.2/setup.py
|
||||
===================================================================
|
||||
--- Python-2.7.2.orig/setup.py 2011-11-04 16:46:34.553796410 -0500
|
||||
+++ Python-2.7.2/setup.py 2011-11-04 16:59:49.692802313 -0500
|
||||
@@ -287,6 +287,15 @@
|
||||
(ext.name, sys.exc_info()[1]))
|
||||
self.failed.append(ext.name)
|
||||
return
|
||||
+
|
||||
+ # If we're cross-compiling, we want to skip the import check
|
||||
+ # i.e. we shouldn't be dynamically loading target shared libs
|
||||
+ if os.environ.get('CROSS_COMPILE') is not None:
|
||||
+ self.announce(
|
||||
+ 'WARNING: skipping import check for cross-compiled "%s"' %
|
||||
+ ext.name)
|
||||
+ return
|
||||
+
|
||||
# Workaround for Mac OS X: The Carbon-based modules cannot be
|
||||
# reliably imported into a command-line Python
|
||||
if 'Carbon' in ext.extra_link_args:
|
|
@ -22,6 +22,7 @@ SRC_URI = "\
|
|||
file://security_issue_2254_fix.patch \
|
||||
file://cgi_py.patch \
|
||||
file://remove_sqlite_rpath.patch \
|
||||
file://setup_py_skip_cross_import_check.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "cf4e6881bb84a7ce6089e4a307f71f14"
|
||||
|
@ -62,6 +63,8 @@ do_compile() {
|
|||
# then call do_install twice we get Makefile.orig == Makefile.sysroot
|
||||
install -m 0644 Makefile Makefile.sysroot
|
||||
|
||||
export CROSS_COMPILE="${TARGET_PREFIX}"
|
||||
|
||||
oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
|
||||
HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
|
||||
STAGING_LIBDIR=${STAGING_LIBDIR} \
|
||||
|
@ -84,6 +87,8 @@ do_install() {
|
|||
# go to ${D}${STAGING...}/...
|
||||
install -m 0644 Makefile.orig Makefile
|
||||
|
||||
export CROSS_COMPILE="${TARGET_PREFIX}"
|
||||
|
||||
oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
|
||||
HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
|
||||
STAGING_LIBDIR=${STAGING_LIBDIR} \
|
||||
|
|
Loading…
Reference in New Issue