summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/fakeroot/fakeroot/absolutepaths.patch47
-rw-r--r--meta/packages/fakeroot/fakeroot_1.9.4.bb5
2 files changed, 50 insertions, 2 deletions
diff --git a/meta/packages/fakeroot/fakeroot/absolutepaths.patch b/meta/packages/fakeroot/fakeroot/absolutepaths.patch
new file mode 100644
index 0000000000..ae18e8a28c
--- /dev/null
+++ b/meta/packages/fakeroot/fakeroot/absolutepaths.patch
@@ -0,0 +1,47 @@
1Image creation runs under a fakeroot context and calls a script which refers
2to the build systems's python. This loads but can find a libpython from staging
3if these are incompatible, anything can break. These scripts should *not* be
4changing LD_LIBRARY_PATH, just adding an LD_PRELOAD with an absolute path. The
5dyanmic linker can figure out anything else with rpaths.
6
7RP - 23/1/10
8
9Index: fakeroot-1.9.4/configure.ac
10===================================================================
11--- fakeroot-1.9.4.orig/configure.ac 2010-01-23 22:34:39.000000000 +0000
12+++ fakeroot-1.9.4/configure.ac 2010-01-23 22:35:14.000000000 +0000
13@@ -414,6 +414,8 @@
14 ;;
15 esac
16
17+LDPRELOADABS=1
18+
19 AC_DEFINE_UNQUOTED([LIBCPATH], "$libcpath", [path to libc shared object])
20 AC_SUBST(DLSUFFIX)
21 AC_SUBST(LDLIBPATHVAR)
22Index: fakeroot-1.9.4/scripts/fakeroot.in
23===================================================================
24--- fakeroot-1.9.4.orig/scripts/fakeroot.in 2010-01-23 22:34:53.000000000 +0000
25+++ fakeroot-1.9.4/scripts/fakeroot.in 2010-01-23 22:37:17.000000000 +0000
26@@ -135,7 +135,7 @@
27 if [ "$WAITINTRAP" -eq 0 ]; then
28 trap "kill -s @signal@ $PID" EXIT INT
29 else
30- trap 'FAKEROOTKEY=$FAKEROOTKEY LD_LIBRARY_PATH="$PATHS" LD_PRELOAD="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT
31+ trap 'FAKEROOTKEY=$FAKEROOTKEY LD_PRELOAD="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT
32 fi
33
34 if test -z "$FAKEROOTKEY" || test -z "$PID"; then
35@@ -158,10 +158,10 @@
36 export FAKEROOT_FD_BASE
37
38 if test -z "$*"; then
39- FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-/bin/sh}
40+ FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-/bin/sh}
41 RESULT=$?
42 else
43- FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" "$@"
44+ FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" "$@"
45 RESULT=$?
46 fi
47
diff --git a/meta/packages/fakeroot/fakeroot_1.9.4.bb b/meta/packages/fakeroot/fakeroot_1.9.4.bb
index 669fa5a38f..189adb7da3 100644
--- a/meta/packages/fakeroot/fakeroot_1.9.4.bb
+++ b/meta/packages/fakeroot/fakeroot_1.9.4.bb
@@ -5,10 +5,11 @@ LICENSE = "GPL"
5# fakeroot needs getopt which is provided by the util-linux package 5# fakeroot needs getopt which is provided by the util-linux package
6RDEPENDS = "util-linux" 6RDEPENDS = "util-linux"
7RDEPENDS_virtclass-native = "util-linux-native" 7RDEPENDS_virtclass-native = "util-linux-native"
8PR = "r2" 8PR = "r3"
9 9
10SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \ 10SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \
11 file://configure-libtool.patch;patch=1" 11 file://configure-libtool.patch;patch=1 \
12 file://absolutepaths.patch;patch=1 "
12 13
13inherit autotools_stage 14inherit autotools_stage
14 15