blob: 0d01b83ebfaf52ea1f79587df77d21c31c3a81bc (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
$NetBSD: patch-aa,v 1.2 2006/01/13 18:26:04 wiz Exp $
--- scripts/fakeroot.in.orig 2005-11-07 02:51:40.000000000 +0100
+++ scripts/fakeroot.in
@@ -19,7 +19,7 @@ PREFIX=@prefix@
BINDIR=@bindir@
LIB=lib@fakeroot_transformed@.so
-PATHS=@libdir@:${PREFIX}/lib64/libfakeroot:${PREFIX}/lib32/libfakeroot
+PATHS=@libdir@:${PREFIX}/lib64:${PREFIX}/lib32
FAKED=${BINDIR}/@faked_transformed@
FAKED_MODE="unknown-is-root"
@@ -101,8 +101,10 @@ then
if test -r "$dir/$LIB"
then
libfound=yes
+ uselib=$dir/$LIB
fi
done
+ LIB=$uselib
else
if test -r "$LIB"
then
@@ -132,11 +134,7 @@ if test -z "$FAKEROOTKEY" || test -z "$P
exit 1
fi
-# Keep other library paths
-if test -n "$LD_LIBRARY_PATH"; then
- PATHS="$PATHS:$LD_LIBRARY_PATH"
-fi
-# ...and preloaded libs
+# Keep preloaded libs
if test -n "$LD_PRELOAD"; then
LIB="$LIB $LD_PRELOAD"
fi
@@ -144,10 +142,10 @@ fi
export FAKEROOT_FD_BASE
if test -z "$*"; then
- FAKEROOTKEY=$FAKEROOTKEY LD_LIBRARY_PATH="$PATHS" LD_PRELOAD="$LIB" ${SHELL:-/bin/sh}
+ FAKEROOTKEY=$FAKEROOTKEY LD_PRELOAD="$LIB" ${SHELL:-/bin/sh}
RESULT=$?
else
- FAKEROOTKEY=$FAKEROOTKEY LD_LIBRARY_PATH="$PATHS" LD_PRELOAD="$LIB" "$@"
+ FAKEROOTKEY=$FAKEROOTKEY LD_PRELOAD="$LIB" "$@"
RESULT=$?
fi
|
