MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fakeroot: Stop setting LD_LIBRARY_PATH as it breaks things (see patch description)

Browse Source 
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie 2010-01-23 22:46:19 +00:00 committed by Joshua Lock
parent 8f7bba3812
commit e0964ab86c
2 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
meta/packages/fakeroot/fakeroot/absolutepaths.patch Normal file
View File

@ -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

5
meta/packages/fakeroot/fakeroot_1.9.4.bb
View File

@ -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