diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2012-02-03 12:21:22 -0800 |
|---|---|---|
| committer |   Saul Wold <sgw@linux.intel.com> | 2012-02-07 14:37:15 -0800 |
| commit | 25016d158af927e0c9e70c3df4674f53fa54fec8 (patch) | |
| tree | b6e273f4cb6a9adc4e4996d6b3318ba617ed080d /meta | |
| parent | 7eae02f47a08587cf5be3d39df0184cf346cbaea (diff) | |
| download | openembedded-core-contrib-25016d158af927e0c9e70c3df4674f53fa54fec8.tar.gz | |
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
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/python/python/host_include_contamination.patch | 27 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python_2.7.2.bb | 3 |
2 files changed, 29 insertions, 1 deletions
diff --git a/meta/recipes-devtools/python/python/host_include_contamination.patch b/meta/recipes-devtools/python/python/host_include_contamination.patch new file mode 100644 index 0000000000..62cb8b16da --- /dev/null +++ b/meta/recipes-devtools/python/python/host_include_contamination.patch @@ -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) diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb index 654c850759..fb5e860fdb 100644 --- a/meta/recipes-devtools/python/python_2.7.2.bb +++ b/meta/recipes-devtools/python/python_2.7.2.bb @@ -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}" |