summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl/perl-5.20.0/Makefile.patch
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.20.0/Makefile.patch
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.20.0/Makefile.patch')
-rw-r--r--meta/recipes-devtools/perl/perl-5.20.0/Makefile.patch58
1 files changed, 58 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/Makefile.patch b/meta/recipes-devtools/perl/perl-5.20.0/Makefile.patch
new file mode 100644
index 0000000000..858e2e10fb
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl-5.20.0/Makefile.patch
@@ -0,0 +1,58 @@
1Upstream-Status:Inappropriate [embedded specific]
2
3Index: perl-5.14.2/Cross/Makefile
4===================================================================
5--- perl-5.14.2.orig/Cross/Makefile
6+++ perl-5.14.2/Cross/Makefile
7@@ -1,6 +1,7 @@
8 ## Toplevel Makefile for cross-compilation of perl
9
10-export TOPDIR=${shell pwd}
11+override TOPDIR=${shell pwd}
12+export TOPDIR
13 include $(TOPDIR)/config
14 export CFLAGS
15 export SYS=$(ARCH)-$(OS)
16@@ -10,7 +11,7 @@ export OPTIMIZATION = -O2
17
18 export CC = $(CROSS)gcc
19 export CXX = $(CROSS)g++
20-export LD = $(CROSS)ld
21+export LD = $(CC)
22 export STRIP = $(CROSS)strip
23 export AR = $(CROSS)ar
24 export RANLIB = $(CROSS)ranlib
25@@ -32,17 +33,6 @@ CFLAGS+=$(FULL_OPTIMIZATION)
26 all:
27 @echo Please read the README file before doing anything else.
28
29-gen_patch:
30- diff -Bbur ../Makefile.SH Makefile.SH > Makefile.SH.patch
31- diff -Bbur ../installperl installperl > installperl.patch
32-
33-patch:
34- cd .. ; if [ ! -e ./CROSS_PATCHED ] ; then \
35- patch -p1 < Cross/Makefile.SH.patch; \
36- patch -p1 < Cross/installperl.patch ; mv installperl installperl-patched; \
37- sed -e 's/XXSTRIPXX/$(SYS)/' installperl-patched > installperl; \
38- touch CROSS_PATCHED ; fi
39-
40 perl:
41 @echo Perl cross-build directory is $(TOPDIR)
42 @echo Target arch is $(SYS)
43@@ -52,11 +42,11 @@ perl:
44 $(TOPDIR)/generate_config_sh config.sh-$(SYS) > $(TOPDIR)/../config.sh
45 cd $(TOPDIR)/.. ; ./Configure -S ; make depend ; make ; make more
46 cd $(TOPDIR)/.. ; mkdir -p fake_config_library ; cp lib/Config.pm lib/Config_heavy.pl fake_config_library
47- cd $(TOPDIR)/.. ; $(MAKE) more2 "PERLRUN=/usr/bin/perl -I$(TOPDIR)/../fake_config_library -MConfig"
48- cd $(TOPDIR)/.. ; $(MAKE) more3 "PERLRUN=/usr/bin/perl -I$(TOPDIR)/../fake_config_library -MConfig"
49- cd $(TOPDIR)/.. ; $(MAKE) more4 "PERLRUN=/usr/bin/perl -I$(TOPDIR)/../fake_config_library -MConfig"
50+ cd $(TOPDIR)/.. ; $(MAKE) more2 "PERLRUN=hostperl -I$(TOPDIR)/../fake_config_library -MConfig"
51+ cd $(TOPDIR)/.. ; $(MAKE) more3 "PERLRUN=hostperl -I$(TOPDIR)/../fake_config_library -MConfig"
52+ cd $(TOPDIR)/.. ; $(MAKE) more4 "PERLRUN=hostperl -I$(TOPDIR)/../fake_config_library -MConfig"
53 cd $(TOPDIR)/.. ; rm -rf install_me_here
54- cd $(TOPDIR)/.. ; make install-strip
55+# cd $(TOPDIR)/.. ; make install-strip
56 cd $(TOPDIR)/.. ; sh -x Cross/warp
57
58