diff options
| author | Khem Raj <raj.khem@gmail.com> | 2012-02-03 12:21:22 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-08 00:50:28 +0000 |
| commit | fadd55460381679483a5786fe27fb34e31113d32 (patch) | |
| tree | 744de982c9dc17854ab71d6797555df8317192a8 /meta/recipes-devtools/python/python | |
| parent | 7d9ac1db134f30550bc31a08c0040339539cd1e3 (diff) | |
| download | ast2050-yocto-poky-fadd55460381679483a5786fe27fb34e31113d32.zip ast2050-yocto-poky-fadd55460381679483a5786fe27fb34e31113d32.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
(From OE-Core rev: 25016d158af927e0c9e70c3df4674f53fa54fec8)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python')
| -rw-r--r-- | meta/recipes-devtools/python/python/host_include_contamination.patch | 27 |
1 files changed, 27 insertions, 0 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 0000000..62cb8b1 --- /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) |
