diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-06-17 00:19:42 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-01 15:39:58 +0100 |
commit | 3f7e55baa6b65b39c5698bb58320f85876cebe23 (patch) | |
tree | 398e48b0e167f958d084ce1e8ccf25162ac9f0a8 /meta/recipes-devtools/perl/perl/Makefile.patch | |
parent | a01d406f6b0d9e08ce6d7408c2928a433fdf1843 (diff) | |
download | poky-3f7e55baa6b65b39c5698bb58320f85876cebe23.tar.gz |
perl: 5.20.0 -> 5.22.0
* Remove:
- perl-5.14.3-fix-CVE-2010-4777.patch: backport
- fix-FF_MORE-crash.patch: backport
- perl-rprovides.inc: it was introduced by 5.8.7, the lines in it are like:
RPROVIDES_perl-module-b-asmdata = "perl-module-${TARGET_SYS}-b-asmdata"
If some packages do RPDEND on something like
perl-module-${TARGET_SYS}-b-asmdatam, we need update the package rather
than keep use RPROVIDES in perl-rprovides.inc, so remove it.
- perl-rprovides_5.20.0.inc: it only has one line:
RPROVIDES_perl-module-module-build, but the perl-module-module-build
is gone in 5.22.0, so remove it.
* Update:
- debian patches from http://ftp.de.debian.org/debian/pool/main/p/perl/perl_5.20.0-1.debian.tar.xz
- Makefile.SH.patch
- Merge 0001-Makefile.SH-fix-do_install-failed.patch into Makefile.SH.patch
- native-nopacklist.patch
- config.sh
* The CGI.pm and Module::Build disappear from core, so no
perl-module-module-build.rpm any more, more info:
http://perltricks.com/article/165/2015/4/10/A-preview-of-Perl-5-22
(From OE-Core rev: 06d43a90acbe63baea62d220659149a3ff2f9198)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/perl/Makefile.patch')
-rw-r--r-- | meta/recipes-devtools/perl/perl/Makefile.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl/Makefile.patch b/meta/recipes-devtools/perl/perl/Makefile.patch new file mode 100644 index 0000000000..858e2e10fb --- /dev/null +++ b/meta/recipes-devtools/perl/perl/Makefile.patch | |||
@@ -0,0 +1,58 @@ | |||
1 | Upstream-Status:Inappropriate [embedded specific] | ||
2 | |||
3 | Index: 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 | |||