diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-01-23 22:46:19 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-01-23 22:46:19 +0000 |
| commit | 75f682d1f671a7b249d80b9347a6ebef260902ae (patch) | |
| tree | 0debf2e02f7c6e24c650ed9e2c055af49d52c583 /meta | |
| parent | b9d958c186da6a3493208ee2f1dce758e11022b1 (diff) | |
| download | openembedded-core-75f682d1f671a7b249d80b9347a6ebef260902ae.tar.gz openembedded-core-75f682d1f671a7b249d80b9347a6ebef260902ae.tar.bz2 openembedded-core-75f682d1f671a7b249d80b9347a6ebef260902ae.tar.xz openembedded-core-75f682d1f671a7b249d80b9347a6ebef260902ae.zip | |
fakeroot: Stop setting LD_LIBRARY_PATH as it breaks things (see patch description)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/fakeroot/fakeroot/absolutepaths.patch | 47 | ||||
| -rw-r--r-- | meta/packages/fakeroot/fakeroot_1.9.4.bb | 5 |
2 files changed, 50 insertions, 2 deletions
diff --git a/meta/packages/fakeroot/fakeroot/absolutepaths.patch b/meta/packages/fakeroot/fakeroot/absolutepaths.patch new file mode 100644 index 000000000..ae18e8a28 --- /dev/null +++ b/meta/packages/fakeroot/fakeroot/absolutepaths.patch @@ -0,0 +1,47 @@ +Image creation runs under a fakeroot context and calls a script which refers +to the build systems's python. This loads but can find a libpython from staging +if these are incompatible, anything can break. These scripts should *not* be +changing LD_LIBRARY_PATH, just adding an LD_PRELOAD with an absolute path. The +dyanmic linker can figure out anything else with rpaths. + +RP - 23/1/10 + +Index: fakeroot-1.9.4/configure.ac +=================================================================== +--- fakeroot-1.9.4.orig/configure.ac 2010-01-23 22:34:39.000000000 +0000 ++++ fakeroot-1.9.4/configure.ac 2010-01-23 22:35:14.000000000 +0000 +@@ -414,6 +414,8 @@ + ;; + esac + ++LDPRELOADABS=1 ++ + AC_DEFINE_UNQUOTED([LIBCPATH], "$libcpath", [path to libc shared object]) + AC_SUBST(DLSUFFIX) + AC_SUBST(LDLIBPATHVAR) +Index: fakeroot-1.9.4/scripts/fakeroot.in +=================================================================== +--- fakeroot-1.9.4.orig/scripts/fakeroot.in 2010-01-23 22:34:53.000000000 +0000 ++++ fakeroot-1.9.4/scripts/fakeroot.in 2010-01-23 22:37:17.000000000 +0000 +@@ -135,7 +135,7 @@ + if [ "$WAITINTRAP" -eq 0 ]; then + trap "kill -s @signal@ $PID" EXIT INT + else +- trap 'FAKEROOTKEY=$FAKEROOTKEY LD_LIBRARY_PATH="$PATHS" LD_PRELOAD="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT ++ trap 'FAKEROOTKEY=$FAKEROOTKEY LD_PRELOAD="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT + fi + + if test -z "$FAKEROOTKEY" || test -z "$PID"; then +@@ -158,10 +158,10 @@ + export FAKEROOT_FD_BASE + + if test -z "$*"; then +- FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-/bin/sh} ++ FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-/bin/sh} + RESULT=$? + else +- FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" "$@" ++ FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" "$@" + RESULT=$? + fi + diff --git a/meta/packages/fakeroot/fakeroot_1.9.4.bb b/meta/packages/fakeroot/fakeroot_1.9.4.bb index f2c3b01c8..d7545ddb2 100644 --- a/meta/packages/fakeroot/fakeroot_1.9.4.bb +++ b/meta/packages/fakeroot/fakeroot_1.9.4.bb @@ -5,10 +5,11 @@ LICENSE = "GPL" # fakeroot needs getopt which is provided by the util-linux package RDEPENDS = "util-linux" RDEPENDS_virtclass-native = "util-linux-native" -PR = "r2" +PR = "r3" SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \ - file://configure-libtool.patch;patch=1" + file://configure-libtool.patch;patch=1 \ + file://absolutepaths.patch;patch=1 " inherit autotools_stage |