summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl/perl-5.14.3/debian/fakeroot.diff
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.14.3/debian/fakeroot.diff')
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/fakeroot.diff45
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/fakeroot.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/fakeroot.diff
new file mode 100644
index 0000000..79e7fcf
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl-5.14.3/debian/fakeroot.diff
@@ -0,0 +1,45 @@
1Upstream-Status:Inappropriate [debian patches]
2From a46a7107fb045ffa6047488b8002fec97b621a11 Mon Sep 17 00:00:00 2001
3From: Brendan O'Dea <bod@debian.org>
4Date: Fri, 18 Mar 2005 22:22:25 +1100
5Subject: Postpone LD_LIBRARY_PATH evaluation to the binary targets.
6
7Modify the setting of LD_LIBRARY_PATH to append pre-existing values at the
8time the rule is evaluated rather than when the Makefile is created.
9
10This is required when building packages with dpkg-buildpackage and fakeroot,
11since fakeroot (which now sets LD_LIBRARY_PATH) is not used for the "build"
12rule where the Makefile is created, but is for the clean/binary* targets.
13
14Patch-Name: debian/fakeroot.diff
15---
16 Makefile.SH | 9 ++-------
17 1 files changed, 2 insertions(+), 7 deletions(-)
18
19diff --git a/Makefile.SH b/Makefile.SH
20index eb6326a..1dac585 100755
21--- a/Makefile.SH
22+++ b/Makefile.SH
23@@ -36,12 +36,7 @@ case "$useshrplib" in
24 true)
25 # Prefix all runs of 'miniperl' and 'perl' with
26 # $ldlibpth so that ./perl finds *this* shared libperl.
27- case "$LD_LIBRARY_PATH" in
28- '')
29- ldlibpth="LD_LIBRARY_PATH=`pwd`";;
30- *)
31- ldlibpth="LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}";;
32- esac
33+ ldlibpth=LD_LIBRARY_PATH=`pwd`'$${LD_LIBRARY_PATH:+:}$$LD_LIBRARY_PATH'
34
35 pldlflags="$cccdlflags"
36 static_ldflags=''
37@@ -112,7 +107,7 @@ true)
38 ;;
39 esac
40 case "$ldlibpthname" in
41- '') ;;
42+ ''|LD_LIBRARY_PATH) ;;
43 *)
44 case "$osname" in
45 os2)