summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl/perl-5.14.3/debian/fakeroot.diff
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-07-01 15:51:53 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-08 11:20:12 +0100
commite73deac6dc7861c64ced49d2a35f781d655db79a (patch)
treedf7352dd791d9714ef62d4a6a87b64e2a90903e2 /meta/recipes-devtools/perl/perl-5.14.3/debian/fakeroot.diff
parent93d77b6ca83e55f3ecbc09f5502d8ae928f2bd91 (diff)
downloadpoky-e73deac6dc7861c64ced49d2a35f781d655db79a.tar.gz
perl, perl-native, perl-ptest: upgrade from 5.14.3 to 5.20.0
Changed: - The Copying has no change, except the company address. - pick patches from debian http://ftp.de.debian.org/debian/pool/main/p/perl/perl_5.20.0-1.debian.tar.xz - Not used by oe: deprecate-with-apt.diff patchlevel.diff fakeroot.diff - Create/Update perl-rdepends_${PV}.inc by the hardcode script; - Update config.sh by: 1) Copy the Perl 5.20.0 source code onto your TARGET machine linux qemuarm 3.14.5-yocto-standard from OE-Core rev: f506d0660c9949485268a92724ac770b5457b0ca 2) Execute sh Configure as normal and configure as required, do not "make"; 3) Compare with the old config.sh files, and update; - perl-ptest.inc 1) Copy the souce code to ptest since almost 112 test cases failed with the reason that no souce code found; 2) Add two patches to fix test case issue; - perl-native Reference perl (5.20.0-1) in debian to update perl shared library headers https://packages.debian.org/experimental/i386/perl/filelist Obsolete: - 09_fix_installperl.patch The dead code was removed from installperl http://perl5.git.perl.org/perl.git/commit/236818e0b9d9fe874831086b4d0b94dc6f245dfd - perl-build-in-t-dir.patch The upstream has fix it. The issue description: Perl cannot cross build in a path containing a directory that has the name of "t". As an example, you can make the perl build fail with "mkdir -p /tmp/build/t", go to the directory, unpack the sources, configure and cross build. - 0001-Fix-misparsing-of-maketext-strings.patch as they are part of the upstream code now: http://perl5.git.perl.org/perl.git/commit/1735f6f53ca19f99c6e9e39496c486af323ba6a8 - 0001-Prevent-premature-hsplit-calls-and-only-trigger-REHA.patch the hash function changed: http://perl5.git.perl.org/perl.git/commit/7dc8663964c66a698d31bbdc8e8abed69bddeec3 (From OE-Core rev: c7ac82415efc42ff7a93c6df163f88f2dde00d26) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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, 0 insertions, 45 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
deleted file mode 100644
index 79e7fcffa7..0000000000
--- a/meta/recipes-devtools/perl/perl-5.14.3/debian/fakeroot.diff
+++ /dev/null
@@ -1,45 +0,0 @@
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)