summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl/perl/debian/no_packlist_perllocal.diff
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-06-17 00:19:42 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-01 15:39:58 +0100
commit3f7e55baa6b65b39c5698bb58320f85876cebe23 (patch)
tree398e48b0e167f958d084ce1e8ccf25162ac9f0a8 /meta/recipes-devtools/perl/perl/debian/no_packlist_perllocal.diff
parenta01d406f6b0d9e08ce6d7408c2928a433fdf1843 (diff)
downloadpoky-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/debian/no_packlist_perllocal.diff')
-rw-r--r--meta/recipes-devtools/perl/perl/debian/no_packlist_perllocal.diff92
1 files changed, 92 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl/debian/no_packlist_perllocal.diff b/meta/recipes-devtools/perl/perl/debian/no_packlist_perllocal.diff
new file mode 100644
index 0000000000..b911fd2762
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/no_packlist_perllocal.diff
@@ -0,0 +1,92 @@
1From 240f2f4aeb3850bc0c5370b9fbc3909573bed9b3 Mon Sep 17 00:00:00 2001
2From: Brendan O'Dea <bod@debian.org>
3Date: Tue, 8 Mar 2005 19:30:38 +1100
4Subject: Don't install .packlist or perllocal.pod for perl or vendor
5
6Patch-Name: debian/no_packlist_perllocal.diff
7---
8 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 35 +++----------------------
9 1 file changed, 3 insertions(+), 32 deletions(-)
10
11diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
12index 570a631..391dc22 100644
13--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
14+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
15@@ -2122,11 +2122,6 @@ pure_perl_install :: all
16 };
17
18 push @m,
19-q{ read "}.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{" \
20- write "}.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{" \
21-} unless $self->{NO_PACKLIST};
22-
23- push @m,
24 q{ "$(INST_LIB)" "$(DESTINSTALLPRIVLIB)" \
25 "$(INST_ARCHLIB)" "$(DESTINSTALLARCHLIB)" \
26 "$(INST_BIN)" "$(DESTINSTALLBIN)" \
27@@ -2158,10 +2153,6 @@ q{ "$(INST_LIB)" "$(DESTINSTALLSITELIB)" \
28 pure_vendor_install :: all
29 $(NOECHO) umask 022; $(MOD_INSTALL) \
30 };
31- push @m,
32-q{ read "}.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{" \
33- write "}.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{" \
34-} unless $self->{NO_PACKLIST};
35
36 push @m,
37 q{ "$(INST_LIB)" "$(DESTINSTALLVENDORLIB)" \
38@@ -2187,37 +2178,19 @@ doc_vendor_install :: all
39
40 push @m, q{
41 doc_perl_install :: all
42- $(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod"
43- -$(NOECHO) umask 022; $(MKPATH) "$(DESTINSTALLARCHLIB)"
44- -$(NOECHO) umask 022; $(DOC_INSTALL) \
45- "Module" "$(NAME)" \
46- "installed into" $(INSTALLPRIVLIB) \
47- LINKTYPE "$(LINKTYPE)" \
48- VERSION "$(VERSION)" \
49- EXE_FILES "$(EXE_FILES)" \
50- >> "}.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{"
51
52 doc_site_install :: all
53- $(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod"
54- -$(NOECHO) umask 02; $(MKPATH) "$(DESTINSTALLARCHLIB)"
55+ $(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLSITEARCH)/perllocal.pod"
56+ -$(NOECHO) umask 02; $(MKPATH) "$(DESTINSTALLSITEARCH)"
57 -$(NOECHO) umask 02; $(DOC_INSTALL) \
58 "Module" "$(NAME)" \
59 "installed into" $(INSTALLSITELIB) \
60 LINKTYPE "$(LINKTYPE)" \
61 VERSION "$(VERSION)" \
62 EXE_FILES "$(EXE_FILES)" \
63- >> "}.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{"
64+ >> "}.$self->catfile('$(DESTINSTALLSITEARCH)','perllocal.pod').q{"
65
66 doc_vendor_install :: all
67- $(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod"
68- -$(NOECHO) umask 022; $(MKPATH) "$(DESTINSTALLARCHLIB)"
69- -$(NOECHO) umask 022; $(DOC_INSTALL) \
70- "Module" "$(NAME)" \
71- "installed into" $(INSTALLVENDORLIB) \
72- LINKTYPE "$(LINKTYPE)" \
73- VERSION "$(VERSION)" \
74- EXE_FILES "$(EXE_FILES)" \
75- >> "}.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{"
76
77 } unless $self->{NO_PERLLOCAL};
78
79@@ -2226,13 +2199,11 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs
80 $(NOECHO) $(NOOP)
81
82 uninstall_from_perldirs ::
83- $(NOECHO) $(UNINSTALL) "}.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{"
84
85 uninstall_from_sitedirs ::
86 $(NOECHO) $(UNINSTALL) "}.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{"
87
88 uninstall_from_vendordirs ::
89- $(NOECHO) $(UNINSTALL) "}.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{"
90 };
91
92 join("",@m);