EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
b11ad48764
Openwrt/tools/fakeroot/patches/000-relocatable.patch

30 lines
917 B
Diff
Raw Normal View History

fakeroot: make fakeroot script relocatable Patch the fakeroot script template to discover faked and libfakeroot.so relative to the STAGING_DIR_HOST environment variable, similar to how it is done for automake, libtool, quilt and autoconf already. This avoids the need for passing the paths to faked and libfakeroot.so manually every time we invoke fakeroot and subsequently allows us to drop OS X specific logic. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-09-10 12:52:31 +00:00
--- a/scripts/fakeroot.in
+++ b/scripts/fakeroot.in
tools: fakeroot: rework relocatable patch to avoid LD_LIBRARY_PATH usage Due to the use of LD_LIBRARY_PATH, the programs running in the fakeroot environment may end up loading bundled SDK libraries using the system ld.so. Rework the relocatability patch to avoid meddling with LD_LIBRARY_PATH and construct the paths to faked and libfakeroot.so directly. Fixes: f93cb5c2c8 ("fakeroot: make fakeroot script relocatable") Reviewed-by: Petr Štetiar <ynezz@true.cz> Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-11-09 20:46:01 +00:00
@@ -30,13 +30,20 @@ fatal ()
fakeroot: make fakeroot script relocatable Patch the fakeroot script template to discover faked and libfakeroot.so relative to the STAGING_DIR_HOST environment variable, similar to how it is done for automake, libtool, quilt and autoconf already. This avoids the need for passing the paths to faked and libfakeroot.so manually every time we invoke fakeroot and subsequently allows us to drop OS X specific logic. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-09-10 12:52:31 +00:00
}
# strip /bin/fakeroot to find install prefix
-FAKEROOT_PREFIX=@prefix@
-FAKEROOT_BINDIR=@bindir@
+if [ -n "$STAGING_DIR_HOST" ]; then
tools: fakeroot: rework relocatable patch to avoid LD_LIBRARY_PATH usage Due to the use of LD_LIBRARY_PATH, the programs running in the fakeroot environment may end up loading bundled SDK libraries using the system ld.so. Rework the relocatability patch to avoid meddling with LD_LIBRARY_PATH and construct the paths to faked and libfakeroot.so directly. Fixes: f93cb5c2c8 ("fakeroot: make fakeroot script relocatable") Reviewed-by: Petr Štetiar <ynezz@true.cz> Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-11-09 20:46:01 +00:00
+ USEABSLIBPATH=1
+ LIB=${STAGING_DIR_HOST}/lib/lib@fakeroot_transformed@@DLSUFFIX@
+ FAKED=${STAGING_DIR_HOST}/bin/faked
+ PATHS=
fakeroot: make fakeroot script relocatable Patch the fakeroot script template to discover faked and libfakeroot.so relative to the STAGING_DIR_HOST environment variable, similar to how it is done for automake, libtool, quilt and autoconf already. This avoids the need for passing the paths to faked and libfakeroot.so manually every time we invoke fakeroot and subsequently allows us to drop OS X specific logic. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-09-10 12:52:31 +00:00
+else
+ FAKEROOT_PREFIX=@prefix@
+ FAKEROOT_BINDIR=@bindir@
tools: fakeroot: rework relocatable patch to avoid LD_LIBRARY_PATH usage Due to the use of LD_LIBRARY_PATH, the programs running in the fakeroot environment may end up loading bundled SDK libraries using the system ld.so. Rework the relocatability patch to avoid meddling with LD_LIBRARY_PATH and construct the paths to faked and libfakeroot.so directly. Fixes: f93cb5c2c8 ("fakeroot: make fakeroot script relocatable") Reviewed-by: Petr Štetiar <ynezz@true.cz> Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-11-09 20:46:01 +00:00
-USEABSLIBPATH=@LDPRELOADABS@
-LIB=lib@fakeroot_transformed@@DLSUFFIX@
fakeroot: make fakeroot script relocatable Patch the fakeroot script template to discover faked and libfakeroot.so relative to the STAGING_DIR_HOST environment variable, similar to how it is done for automake, libtool, quilt and autoconf already. This avoids the need for passing the paths to faked and libfakeroot.so manually every time we invoke fakeroot and subsequently allows us to drop OS X specific logic. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-09-10 12:52:31 +00:00
-PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot
tools: fakeroot: rework relocatable patch to avoid LD_LIBRARY_PATH usage Due to the use of LD_LIBRARY_PATH, the programs running in the fakeroot environment may end up loading bundled SDK libraries using the system ld.so. Rework the relocatability patch to avoid meddling with LD_LIBRARY_PATH and construct the paths to faked and libfakeroot.so directly. Fixes: f93cb5c2c8 ("fakeroot: make fakeroot script relocatable") Reviewed-by: Petr Štetiar <ynezz@true.cz> Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-11-09 20:46:01 +00:00
-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
fakeroot: make fakeroot script relocatable Patch the fakeroot script template to discover faked and libfakeroot.so relative to the STAGING_DIR_HOST environment variable, similar to how it is done for automake, libtool, quilt and autoconf already. This avoids the need for passing the paths to faked and libfakeroot.so manually every time we invoke fakeroot and subsequently allows us to drop OS X specific logic. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-09-10 12:52:31 +00:00
FAKED_MODE="unknown-is-root"
tools: fakeroot: rework relocatable patch to avoid LD_LIBRARY_PATH usage Due to the use of LD_LIBRARY_PATH, the programs running in the fakeroot environment may end up loading bundled SDK libraries using the system ld.so. Rework the relocatability patch to avoid meddling with LD_LIBRARY_PATH and construct the paths to faked and libfakeroot.so directly. Fixes: f93cb5c2c8 ("fakeroot: make fakeroot script relocatable") Reviewed-by: Petr Štetiar <ynezz@true.cz> Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-11-09 20:46:01 +00:00
export FAKED_MODE
Reference in New Issue Copy Permalink