diff options
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.12.3/debian/fakeroot.diff')
-rw-r--r-- | meta/recipes-devtools/perl/perl-5.12.3/debian/fakeroot.diff | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.12.3/debian/fakeroot.diff b/meta/recipes-devtools/perl/perl-5.12.3/debian/fakeroot.diff new file mode 100644 index 0000000000..2c8def5a81 --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.12.3/debian/fakeroot.diff | |||
@@ -0,0 +1,45 @@ | |||
1 | Upstream-Status:Inappropriate [debian patch] | ||
2 | |||
3 | Subject: Postpone LD_LIBRARY_PATH evaluation to the binary targets. | ||
4 | |||
5 | Modify the setting of LD_LIBRARY_PATH to append pre-existing values at the | ||
6 | time the rule is evaluated rather than when the Makefile is created. | ||
7 | |||
8 | This is required when building packages with dpkg-buildpackage and fakeroot, | ||
9 | since fakeroot (which now sets LD_LIBRARY_PATH) is not used for the "build" | ||
10 | rule where the Makefile is created, but is for the clean/binary* targets. | ||
11 | |||
12 | |||
13 | --- | ||
14 | Makefile.SH | 9 ++------- | ||
15 | 1 files changed, 2 insertions(+), 7 deletions(-) | ||
16 | |||
17 | diff --git a/Makefile.SH b/Makefile.SH | ||
18 | index fc13b2b..d420229 100755 | ||
19 | --- a/Makefile.SH | ||
20 | +++ b/Makefile.SH | ||
21 | @@ -50,12 +50,7 @@ case "$useshrplib" in | ||
22 | true) | ||
23 | # Prefix all runs of 'miniperl' and 'perl' with | ||
24 | # $ldlibpth so that ./perl finds *this* shared libperl. | ||
25 | - case "$LD_LIBRARY_PATH" in | ||
26 | - '') | ||
27 | - ldlibpth="LD_LIBRARY_PATH=`pwd`";; | ||
28 | - *) | ||
29 | - ldlibpth="LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}";; | ||
30 | - esac | ||
31 | + ldlibpth=LD_LIBRARY_PATH=`pwd`'$${LD_LIBRARY_PATH:+:}$$LD_LIBRARY_PATH' | ||
32 | |||
33 | pldlflags="$cccdlflags" | ||
34 | static_ldflags='' | ||
35 | @@ -126,7 +121,7 @@ true) | ||
36 | ;; | ||
37 | esac | ||
38 | case "$ldlibpthname" in | ||
39 | - '') ;; | ||
40 | + ''|LD_LIBRARY_PATH) ;; | ||
41 | *) | ||
42 | case "$osname" in | ||
43 | os2) | ||
44 | -- | ||
45 | tg: (a508b62..) debian/fakeroot (depends on: upstream) | ||