summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl/perl-5.14.3/Makefile.patch
diff options
context:
space:
mode:
authorKang Kai <kai.kang@windriver.com>2013-01-21 16:57:12 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-25 12:42:48 +0000
commit526498282688c6e110727c9184efd1b69997c9db (patch)
tree96f2869b1983b070fc4bbd72eeb31aa1f9d5149c /meta/recipes-devtools/perl/perl-5.14.3/Makefile.patch
parente80f02a93b1c717e6bc7001a05c773290ca68992 (diff)
downloadpoky-526498282688c6e110727c9184efd1b69997c9db.tar.gz
perl: update to 5.14.3
There is a securty issue: http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-5195 Update perl to 5.14.3 to resolve this problem. Patches hurd-ccflags.diff, h2ph-multiarch.diff, index-tainting.diff and hurd-hints.diff have been merged, so remove them from SRC_URI. Update patches config.sh and Makefile.SH.patch with new PV. [Yocto 3701] (From OE-Core rev: b1fd25e05308cabb56afe1d4276470bf7380ea59) Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.14.3/Makefile.patch')
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/Makefile.patch58
1 files changed, 58 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.14.3/Makefile.patch b/meta/recipes-devtools/perl/perl-5.14.3/Makefile.patch
new file mode 100644
index 0000000000..858e2e10fb
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl-5.14.3/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