summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/fakeroot/fakeroot-1.14.4/absolutepaths.patch
diff options
context:
space:
mode:
authorQing He <qing.he@intel.com>2010-12-10 14:03:42 +0800
committerSaul Wold <Saul.Wold@intel.com>2010-12-10 22:01:31 -0800
commit082c4e2440582cf44fbc65ba97ba3577da95ff4b (patch)
tree01aed777a90db61e0c995b333c7ead87b2900636 /meta/recipes-devtools/fakeroot/fakeroot-1.14.4/absolutepaths.patch
parent1901134554cd14e2ad9203452dce0cf4502b08be (diff)
downloadpoky-082c4e2440582cf44fbc65ba97ba3577da95ff4b.tar.gz
fakeroot: upgrade to version 1.14.5
from 1.14.4 changes: - install to ${includedir} instead of ${STAGING_INCDIR} - fakeroot has long been under GPLv3 Signed-off-by: Qing He <qing.he@intel.com>
Diffstat (limited to 'meta/recipes-devtools/fakeroot/fakeroot-1.14.4/absolutepaths.patch')
-rw-r--r--meta/recipes-devtools/fakeroot/fakeroot-1.14.4/absolutepaths.patch47
1 files changed, 0 insertions, 47 deletions
diff --git a/meta/recipes-devtools/fakeroot/fakeroot-1.14.4/absolutepaths.patch b/meta/recipes-devtools/fakeroot/fakeroot-1.14.4/absolutepaths.patch
deleted file mode 100644
index ae18e8a28c..0000000000
--- a/meta/recipes-devtools/fakeroot/fakeroot-1.14.4/absolutepaths.patch
+++ /dev/null
@@ -1,47 +0,0 @@
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