aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/fakeroot/patches/000-relocatable.patch24
1 files changed, 14 insertions, 10 deletions
diff --git a/tools/fakeroot/patches/000-relocatable.patch b/tools/fakeroot/patches/000-relocatable.patch
index 9f6915bfe8..0408acfa25 100644
--- a/tools/fakeroot/patches/000-relocatable.patch
+++ b/tools/fakeroot/patches/000-relocatable.patch
@@ -1,25 +1,29 @@
--- a/scripts/fakeroot.in
+++ b/scripts/fakeroot.in
-@@ -30,12 +30,19 @@ fatal ()
+@@ -30,13 +30,20 @@ fatal ()
}
# strip /bin/fakeroot to find install prefix
-FAKEROOT_PREFIX=@prefix@
-FAKEROOT_BINDIR=@bindir@
+if [ -n "$STAGING_DIR_HOST" ]; then
-+ FAKEROOT_PREFIX="${STAGING_DIR_HOST}"
-+ FAKEROOT_BINDIR="${STAGING_DIR_HOST}/bin"
-+ FAKEROOT_LIBDIR="${STAGING_DIR_HOST}/lib"
++ USEABSLIBPATH=1
++ LIB=${STAGING_DIR_HOST}/lib/lib@fakeroot_transformed@@DLSUFFIX@
++ FAKED=${STAGING_DIR_HOST}/bin/faked
++ PATHS=
+else
+ FAKEROOT_PREFIX=@prefix@
+ FAKEROOT_BINDIR=@bindir@
-+ FAKEROOT_LIBDIR=@libdir@
-+fi
- USEABSLIBPATH=@LDPRELOADABS@
- LIB=lib@fakeroot_transformed@@DLSUFFIX@
+-USEABSLIBPATH=@LDPRELOADABS@
+-LIB=lib@fakeroot_transformed@@DLSUFFIX@
-PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot
-+PATHS=${FAKEROOT_LIBDIR}:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot
- FAKED=${FAKEROOT_BINDIR}/@faked_transformed@
+-FAKED=${FAKEROOT_BINDIR}/@faked_transformed@
++ USEABSLIBPATH=@LDPRELOADABS@
++ LIB=lib@fakeroot_transformed@@DLSUFFIX@
++ PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot
++ FAKED=${FAKEROOT_BINDIR}/@faked_transformed@
++fi
FAKED_MODE="unknown-is-root"
+ export FAKED_MODE