[Fakeroot-commits] [SCM] fakeroot branch, upstream, updated. 08ed00124d8b6b445d3b91a9aa15eec638b02f05
Clint Adams
schizo at debian.org
Sun Nov 15 03:17:14 UTC 2009
The following commit has been merged in the upstream branch:
commit 73aa0711fe698de89ccadb7ea50670a5726c4c7d
Author: Clint Adams <schizo at debian.org>
Date: Tue Feb 27 14:40:43 2007 +0000
Apply patch from Heikki Lindholm to fix MacOS X support even more.
git-archimport-id: fakeroot at packages.debian.org--fakeroot/fakeroot--main--0.0--patch-113
diff --git a/configure.ac b/configure.ac
index afb94b6..41dcff5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -316,6 +316,7 @@ dnl This should really be done intelligently.
DLSUFFIX=".so"
LDLIBPATHVAR="LD_LIBRARY_PATH"
LDPRELOADVAR="LD_PRELOAD"
+LDPRELOADABS=0
LDEXTRAVAR=""
case $target_cpu:$target_os in
(alpha*:linux*|ia64*:linux*)
@@ -350,6 +351,7 @@ case $target_cpu:$target_os in
DLSUFFIX=".dylib"
LDLIBPATHVAR="DYLD_LIBRARY_PATH"
LDPRELOADVAR="DYLD_INSERT_LIBRARIES"
+ LDPRELOADABS=1
LDEXTRAVAR="DYLD_FORCE_FLAT_NAMESPACE=1"
;;
(*)
@@ -363,6 +365,7 @@ AC_DEFINE_UNQUOTED([LIBCPATH], "$libcpath", [path to libc shared object])
AC_SUBST(DLSUFFIX)
AC_SUBST(LDLIBPATHVAR)
AC_SUBST(LDPRELOADVAR)
+AC_SUBST(LDPRELOADABS)
AC_SUBST(LDEXTRAVAR)
dnl Checks for library functions.
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 863dba5..c895e12 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -14,6 +14,7 @@ do_subst = sed -e 's,[@]prefix[@],$(prefix),g' \
-e 's,[@]DLSUFFIX[@],$(DLSUFFIX),g' \
-e 's,[@]LDLIBPATHVAR[@],$(LDLIBPATHVAR),g' \
-e 's,[@]LDPRELOADVAR[@],$(LDPRELOADVAR),g' \
+ -e 's,[@]LDPRELOADABS[@],$(LDPRELOADABS),g' \
-e 's,[@]LDEXTRAVAR[@],$(LDEXTRAVAR),g'
fakeroot: $(srcdir)/fakeroot.in Makefile
diff --git a/scripts/fakeroot.in b/scripts/fakeroot.in
index c61e490..db3496c 100755
--- a/scripts/fakeroot.in
+++ b/scripts/fakeroot.in
@@ -18,6 +18,7 @@ EOF
PREFIX=@prefix@
BINDIR=@bindir@
+USEABSLIBPATH=@LDPRELOADABS@
LIB=lib at fakeroot_transformed@@DLSUFFIX@
PATHS=@libdir@:${PREFIX}/lib64/libfakeroot:${PREFIX}/lib32/libfakeroot
FAKED=${BINDIR}/@faked_transformed@
@@ -94,6 +95,7 @@ done
shift #get rid of the '--'
# make sure the preload is available
+ABSLIB=""
if [ -n "$PATHS" ]
then
for dir in `echo $PATHS | sed 's/:/ /g'`
@@ -101,12 +103,14 @@ then
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
@@ -132,6 +136,9 @@ if test -z "$FAKEROOTKEY" || test -z "$PID"; then
exit 1
fi
+if test $USEABSLIBPATH -ne 0 ; then
+ LIB=$ABSLIB
+fi
# Keep other library paths
if test -n "$@LDLIBPATHVAR@"; then
PATHS="$PATHS:$@LDLIBPATHVAR@"
--
fakeroot
More information about the Fakeroot-commits
mailing list