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 11:54:01 +0100 |
| commit | 546175abbac8a3c7ec4b5a4d014b05378bbb092f (patch) | |
| tree | 8fab161598468447fc29f05de4189715f9dd7baf /meta/recipes-devtools | |
| parent | 40c34087dea6869e5ec9a655980de3c3baa01960 (diff) | |
| download | openembedded-core-546175abbac8a3c7ec4b5a4d014b05378bbb092f.tar.gz openembedded-core-546175abbac8a3c7ec4b5a4d014b05378bbb092f.tar.bz2 openembedded-core-546175abbac8a3c7ec4b5a4d014b05378bbb092f.tar.xz openembedded-core-546175abbac8a3c7ec4b5a4d014b05378bbb092f.zip | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
| -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 8cf45da5c..53e994f4b 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 @@ require python.inc DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib" -PR = "${INC_PR}.9" +PR = "${INC_PR}.10" DISTRO_SRC_URI ?= "file://sitecustomize.py" DISTRO_SRC_URI_linuxstdbase = "" @@ -62,6 +62,9 @@ do_compile() { # remove hardcoded ccache, see http://bugs.openembedded.net/show_bug.cgi?id=4144 sed -i -e s,ccache,'$(CCACHE)', Makefile + # remove any bogus LD_LIBRARY_PATH + sed -i -e s,RUNSHARED=.*,RUNSHARED=, Makefile + install -m 0644 Makefile Makefile.orig sed -i -e 's,${includedir},${STAGING_INCDIR},' Makefile sed -i -e 's,${libdir},${STAGING_LIBDIR},' Makefile |