main/fakeroot: do not set LD_LIBRARY_PATH

it breaks cross-binutils which use rpath to pick correct
libbfd instead of the one in /usr/lib.

2 files changed, 85 insertions, 1 deletions

diff --git a/main/fakeroot/APKBUILD b/main/fakeroot/APKBUILD
index a0906ac88a..623b71000b 100644
--- a/main/fakeroot/APKBUILD
+++ b/main/fakeroot/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fakeroot
 pkgver=1.20.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
 arch="all"
 license='GPL'
@@ -15,6 +15,7 @@ source="http://ftp.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.o
 	fakeroot-hide-dlsym-errors.patch
 	fakeroot-no64.patch
 	fakeroot-stdint.patch
+	fakeroot-no-ldlibrarypath.patch
 	xstatjunk.patch
 	"
 
@@ -56,16 +57,19 @@ md5sums="a4b4564a75024aa96c86e4d1017ac786  fakeroot_1.20.2.orig.tar.bz2
 624cd86a66d020d01bde4ba60efc4d40  fakeroot-hide-dlsym-errors.patch
 3fc66a8ffb365fcf2acd652d33f101a2  fakeroot-no64.patch
 50a899380cfd5eae8ce3aaf878fb17b2  fakeroot-stdint.patch
+75b41eae4e68552728c6df4cbce28bf2  fakeroot-no-ldlibrarypath.patch
 ff42badefea59d969f2df3994110d747  xstatjunk.patch"
 sha256sums="7c0a164d19db3efa9e802e0fc7cdfeff70ec6d26cdbdc4338c9c2823c5ea230c  fakeroot_1.20.2.orig.tar.bz2
 6b881eaecacacba100cbaa96d552c51a622639a40f3d7701b6756b4cde0e5d95  busybox-getopt.patch
 915313c164b2968bc785621d14e652aae0bb74cec01510457d1fa601f23e0ca2  fakeroot-hide-dlsym-errors.patch
 3420da0789caef582fcfc890c657da4136b3b06d1205443f4409cdf85ab02a46  fakeroot-no64.patch
 8739c0b79c3f2b0e46cd0dffa8b73d946efbe994f61f69f7d1115c2dcec22df1  fakeroot-stdint.patch
+e95d525b119d97aeacc944879664b281218292f70eabe9ee65fae38a8712c6c2  fakeroot-no-ldlibrarypath.patch
 78f2fcc1ffcacdfbfa8c74bdb2a528c9226921fde949d451a0269d8c35d6a027  xstatjunk.patch"
 sha512sums="1ac231f995774aa40f43c4325cd9e6de45365963277c32a85776690c3e7fd281ac410f3d91395dc1e5e5ca3b143e89914e048632011a3985ead216e870852231  fakeroot_1.20.2.orig.tar.bz2
 9024263f4452bcb46c9670f8b8106e67c2d9b4cf45215def7ff4e78d2c908e4f98d494dd6f514fb3325165b0f61571fa031632b4642163cf9b1b3386d0867c5f  busybox-getopt.patch
 666f41d6adc5e65eba419e08d5bbc4f561e40b0fc7bfa82090eb87962a7f3193bf319754e04aca289e865c66df2ecced1dbb45c9aa9f093657f22193dda25354  fakeroot-hide-dlsym-errors.patch
 7a832e6bed3838c7c488e0e12ba84b8d256e84bbb06d6020247452a991de505fa5c6bd7bcb84dce8753eb242e0fcab863b5461301cd56695f2b003fe8d6ff209  fakeroot-no64.patch
 ed7a58b0d201139545420f9e5429f503c00e00f36dea84473e77ea99b23bb8d421da1a8a8ce98ff90e72e378dff4cb9ea3c1a863a969899a5f50dfac3b9c5fac  fakeroot-stdint.patch
+acfc1e5efce132279adddf9e11c28d65602059d5cd723ad98b67cb9183e1de68445f3bba7ac54ee60265b85f25141fcc9b2156f551aa5c624a92631320f5b743  fakeroot-no-ldlibrarypath.patch
 27bac2aaea72547efc7c48313f8c2eee3b60d778e7bf4ebb49a37a750b7477a5080cfa7fbc2c135527ade7e9fb826ccaaba06b85d2713cad21891608e9c1ad4d  xstatjunk.patch"
diff --git a/main/fakeroot/fakeroot-no-ldlibrarypath.patch b/main/fakeroot/fakeroot-no-ldlibrarypath.patch
new file mode 100644
index 0000000000..e7b9a037d0
--- /dev/null
+++ b/main/fakeroot/fakeroot-no-ldlibrarypath.patch
@@ -0,0 +1,80 @@
+diff -ru fakeroot-1.20.2.orig/scripts/fakeroot.in fakeroot-1.20.2/scripts/fakeroot.in
+--- fakeroot-1.20.2.orig/scripts/fakeroot.in	2015-11-12 10:51:23.241681379 +0200
++++ fakeroot-1.20.2/scripts/fakeroot.in	2015-11-12 10:56:53.331985288 +0200
+@@ -34,8 +34,7 @@
+ FAKEROOT_BINDIR=@bindir@
+ 
+ USEABSLIBPATH=@LDPRELOADABS@
+-LIB=lib@fakeroot_transformed@@DLSUFFIX@
+-PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot
++LIB=@libdir@/lib@fakeroot_transformed@@DLSUFFIX@
+ FAKED=${FAKEROOT_BINDIR}/@faked_transformed@
+ 
+ FAKED_MODE="unknown-is-root"
+@@ -68,7 +67,6 @@
+     -l|--lib)
+        shift
+        LIB=`eval echo "$1"`
+-       PATHS=
+        ;;
+     -f|--faked)
+        shift
+@@ -111,23 +109,11 @@
+ 
+ # make sure the preload is available
+ ABSLIB=""
+-if [ -n "$PATHS" ]
+-then
+-    for dir in `echo $PATHS | sed 's/:/ /g'`
+-    do
+-	if test -r "$dir/$LIB"
+-	then
+-	    libfound=yes
+-	    ABSLIB="$dir/$LIB"
+-	fi
+-    done
+-else
+     if test -r "$LIB"
+     then
+ 	libfound=yes
+ 	ABSLIB="$LIB"
+     fi
+-fi
+ 
+ if test $libfound = no
+ then
+@@ -148,7 +134,7 @@
+ if [ "$WAITINTRAP" -eq 0 ]; then
+   trap "kill -s @signal@ $PID" EXIT INT
+ else
+-  @MACOSX_FALSE@trap 'FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDPRELOADVAR@="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT
++  @MACOSX_FALSE@trap 'FAKEROOTKEY=$FAKEROOTKEY @LDPRELOADVAR@="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT
+   @MACOSX_TRUE@trap 'FAKEROOTKEY=$FAKEROOTKEY @LDPRELOADVAR@="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT
+ fi
+ 
+@@ -159,10 +145,6 @@
+ if test $USEABSLIBPATH -ne 0 ; then
+   LIB=$ABSLIB
+ fi
+-# Keep other library paths
+-if test -n "$@LDLIBPATHVAR@"; then
+-  PATHS="$PATHS:$@LDLIBPATHVAR@"
+-fi
+ # ...and preloaded libs
+ if test -n "$@LDPRELOADVAR@"; then
+   LIB="$LIB:$@LDPRELOADVAR@"
+@@ -171,11 +153,11 @@
+ export FAKEROOT_FD_BASE
+ 
+ if test -z "$*"; then
+-  @MACOSX_FALSE@FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-/bin/sh}
++  @MACOSX_FALSE@FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-/bin/sh}
+   @MACOSX_TRUE@FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-/bin/sh}
+   RESULT=$?
+ else
+-  @MACOSX_FALSE@FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" "$@"
++  @MACOSX_FALSE@FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" "$@"
+   @MACOSX_TRUE@FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" "$@"
+   RESULT=$?
+ fi
+