diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2014-07-01 15:51:53 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-08 11:19:48 +0100 |
commit | c7ac82415efc42ff7a93c6df163f88f2dde00d26 (patch) | |
tree | 2d5200f41df13b7baeca53cff1b252a0d32fb7bf /meta/recipes-devtools/perl/perl-5.20.0/Makefile.patch | |
parent | 318a8e65c8a9cc016fd9e0b7093443a27ade79a2 (diff) | |
download | openembedded-core-c7ac82415efc42ff7a93c6df163f88f2dde00d26.tar.gz openembedded-core-c7ac82415efc42ff7a93c6df163f88f2dde00d26.tar.bz2 openembedded-core-c7ac82415efc42ff7a93c6df163f88f2dde00d26.zip |
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
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.patch | 58 |
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 @@ +Upstream-Status:Inappropriate [embedded specific] + +Index: perl-5.14.2/Cross/Makefile +=================================================================== +--- perl-5.14.2.orig/Cross/Makefile ++++ perl-5.14.2/Cross/Makefile +@@ -1,6 +1,7 @@ + ## Toplevel Makefile for cross-compilation of perl + +-export TOPDIR=${shell pwd} ++override TOPDIR=${shell pwd} ++export TOPDIR + include $(TOPDIR)/config + export CFLAGS + export SYS=$(ARCH)-$(OS) +@@ -10,7 +11,7 @@ export OPTIMIZATION = -O2 + + export CC = $(CROSS)gcc + export CXX = $(CROSS)g++ +-export LD = $(CROSS)ld ++export LD = $(CC) + export STRIP = $(CROSS)strip + export AR = $(CROSS)ar + export RANLIB = $(CROSS)ranlib +@@ -32,17 +33,6 @@ CFLAGS+=$(FULL_OPTIMIZATION) + all: + @echo Please read the README file before doing anything else. + +-gen_patch: +- diff -Bbur ../Makefile.SH Makefile.SH > Makefile.SH.patch +- diff -Bbur ../installperl installperl > installperl.patch +- +-patch: +- cd .. ; if [ ! -e ./CROSS_PATCHED ] ; then \ +- patch -p1 < Cross/Makefile.SH.patch; \ +- patch -p1 < Cross/installperl.patch ; mv installperl installperl-patched; \ +- sed -e 's/XXSTRIPXX/$(SYS)/' installperl-patched > installperl; \ +- touch CROSS_PATCHED ; fi +- + perl: + @echo Perl cross-build directory is $(TOPDIR) + @echo Target arch is $(SYS) +@@ -52,11 +42,11 @@ perl: + $(TOPDIR)/generate_config_sh config.sh-$(SYS) > $(TOPDIR)/../config.sh + cd $(TOPDIR)/.. ; ./Configure -S ; make depend ; make ; make more + cd $(TOPDIR)/.. ; mkdir -p fake_config_library ; cp lib/Config.pm lib/Config_heavy.pl fake_config_library +- cd $(TOPDIR)/.. ; $(MAKE) more2 "PERLRUN=/usr/bin/perl -I$(TOPDIR)/../fake_config_library -MConfig" +- cd $(TOPDIR)/.. ; $(MAKE) more3 "PERLRUN=/usr/bin/perl -I$(TOPDIR)/../fake_config_library -MConfig" +- cd $(TOPDIR)/.. ; $(MAKE) more4 "PERLRUN=/usr/bin/perl -I$(TOPDIR)/../fake_config_library -MConfig" ++ cd $(TOPDIR)/.. ; $(MAKE) more2 "PERLRUN=hostperl -I$(TOPDIR)/../fake_config_library -MConfig" ++ cd $(TOPDIR)/.. ; $(MAKE) more3 "PERLRUN=hostperl -I$(TOPDIR)/../fake_config_library -MConfig" ++ cd $(TOPDIR)/.. ; $(MAKE) more4 "PERLRUN=hostperl -I$(TOPDIR)/../fake_config_library -MConfig" + cd $(TOPDIR)/.. ; rm -rf install_me_here +- cd $(TOPDIR)/.. ; make install-strip ++# cd $(TOPDIR)/.. ; make install-strip + cd $(TOPDIR)/.. ; sh -x Cross/warp + + |