diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-11 11:53:58 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-11 12:08:14 +0100 |
commit | 06a7ffdeca88d544bb113c73a330913c21664e61 (patch) | |
tree | 1502e40a25ef80cc070b7ccc3eabf90be15e3552 /meta | |
parent | 5fb36b041c612b80cf35d6ecd35bddd1e108a210 (diff) | |
download | poky-06a7ffdeca88d544bb113c73a330913c21664e61.tar.gz |
python: Fix host contamination issue
python-nativesdk could fail with:
| /srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc/build/build/tmp/sysroots/x86_64-linux/usr/bin/python: /lib64/libc.so.6: version `GLIBC_2.14' not found (required by /srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/python-nativesdk-2.7.2-r1.9/Python-2.7.2/libpython2.7.so.1.0)
| make: *** [sharedmods] Error 1
which is caused by the fact LD_LIBRARY_PATH is being set to include WORKDIR
when calling HOSTPYTHON. HOSTPYTHON is from python-native and needs no such
help so the easiest fix here is not to set crazy LD_LIBRARY_PATH values
since we should never be running anything from WORKDIR given the way we build
things.
The patch clears out the RUNSHARED variable which would contain the
LD_LIBRARY_PATH value prior to this patch.
(From OE-Core rev: 546175abbac8a3c7ec4b5a4d014b05378bbb092f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/python/python_2.7.2.bb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb index 8cf45da5cb..53e994f4b5 100644 --- a/meta/recipes-devtools/python/python_2.7.2.bb +++ b/meta/recipes-devtools/python/python_2.7.2.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require python.inc | 1 | require python.inc |
2 | DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib" | 2 | DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib" |
3 | PR = "${INC_PR}.9" | 3 | PR = "${INC_PR}.10" |
4 | 4 | ||
5 | DISTRO_SRC_URI ?= "file://sitecustomize.py" | 5 | DISTRO_SRC_URI ?= "file://sitecustomize.py" |
6 | DISTRO_SRC_URI_linuxstdbase = "" | 6 | DISTRO_SRC_URI_linuxstdbase = "" |
@@ -62,6 +62,9 @@ do_compile() { | |||
62 | # remove hardcoded ccache, see http://bugs.openembedded.net/show_bug.cgi?id=4144 | 62 | # remove hardcoded ccache, see http://bugs.openembedded.net/show_bug.cgi?id=4144 |
63 | sed -i -e s,ccache,'$(CCACHE)', Makefile | 63 | sed -i -e s,ccache,'$(CCACHE)', Makefile |
64 | 64 | ||
65 | # remove any bogus LD_LIBRARY_PATH | ||
66 | sed -i -e s,RUNSHARED=.*,RUNSHARED=, Makefile | ||
67 | |||
65 | install -m 0644 Makefile Makefile.orig | 68 | install -m 0644 Makefile Makefile.orig |
66 | sed -i -e 's,${includedir},${STAGING_INCDIR},' Makefile | 69 | sed -i -e 's,${includedir},${STAGING_INCDIR},' Makefile |
67 | sed -i -e 's,${libdir},${STAGING_LIBDIR},' Makefile | 70 | sed -i -e 's,${libdir},${STAGING_LIBDIR},' Makefile |