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 @@
+Upstream-Status:Inappropriate [debian patch]
+
+Subject: Postpone LD_LIBRARY_PATH evaluation to the binary targets.
+
+Modify the setting of LD_LIBRARY_PATH to append pre-existing values at the
+time the rule is evaluated rather than when the Makefile is created.
+
+This is required when building packages with dpkg-buildpackage and fakeroot,
+since fakeroot (which now sets LD_LIBRARY_PATH) is not used for the "build"
+rule where the Makefile is created, but is for the clean/binary* targets.
+
+
+---
+ Makefile.SH |    9 ++-------
+ 1 files changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile.SH b/Makefile.SH
+index fc13b2b..d420229 100755
+--- a/Makefile.SH
++++ b/Makefile.SH
+@@ -50,12 +50,7 @@ case "$useshrplib" in
+ true)
+        # Prefix all runs of 'miniperl' and 'perl' with
+        # $ldlibpth so that ./perl finds *this* shared libperl.
+-       case "$LD_LIBRARY_PATH" in
+-       '')
+-               ldlibpth="LD_LIBRARY_PATH=`pwd`";;
+-       *)
+-               ldlibpth="LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}";;
+-       esac
++       ldlibpth=LD_LIBRARY_PATH=`pwd`'$${LD_LIBRARY_PATH:+:}$$LD_LIBRARY_PATH'
+ 
+        pldlflags="$cccdlflags"
+        static_ldflags=''
+@@ -126,7 +121,7 @@ true)
+            ;;
+        esac
+        case "$ldlibpthname" in
+-       '') ;;
++       ''|LD_LIBRARY_PATH) ;;
+        *)
+            case "$osname" in
+            os2)
+-- 
+tg: (a508b62..) debian/fakeroot (depends on: upstream)