summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl/perl/debian/perlivp.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/perlivp.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/perlivp.diff')
-rw-r--r--meta/recipes-devtools/perl/perl/debian/perlivp.diff39
1 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl/debian/perlivp.diff b/meta/recipes-devtools/perl/perl/debian/perlivp.diff
new file mode 100644
index 0000000000..2c1eab9709
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/debian/perlivp.diff
@@ -0,0 +1,39 @@
1From fbfbeb7a690d703a3cdc56f923e89eb7b7997d31 Mon Sep 17 00:00:00 2001
2From: Niko Tyni <ntyni@debian.org>
3Date: Fri, 9 Jan 2009 18:54:47 +0200
4Subject: Make perlivp skip include directories in /usr/local
5
6Bug-Debian: http://bugs.debian.org/510895
7
8On Sat, Jan 10, 2009 at 12:37:18AM +1100, Brendan O'Dea wrote:
9> On Wed, Jan 7, 2009 at 12:21 AM, Niko Tyni <ntyni@debian.org> wrote:
10
11> > We could create the directories in a postinst script, but I'm not sure
12> > I see the point. They will be created automatically when installing
13> > CPAN modules.
14>
15> The directories are intentionally not created, as this way they are
16> excluded from the search path at start-up, saving a bunch of wasted
17> stats at use/require time in the common case that the user has not
18> installed any local packages. As Niko points out, they will be
19> created as required.
20
21Signed-off-by: Niko Tyni <ntyni@debian.org>
22
23Patch-Name: debian/perlivp.diff
24---
25 utils/perlivp.PL | 1 +
26 1 file changed, 1 insertion(+)
27
28diff --git a/utils/perlivp.PL b/utils/perlivp.PL
29index c2f0a11..cc49f96 100644
30--- a/utils/perlivp.PL
31+++ b/utils/perlivp.PL
32@@ -153,6 +153,7 @@ my $INC_total = 0;
33 my $INC_there = 0;
34 foreach (@INC) {
35 next if $_ eq '.'; # skip -d test here
36+ next if m|/usr/local|; # not shipped on Debian
37 if (-d $_) {
38 print "## Perl \@INC directory '$_' exists.\n" if $opt{'v'};
39 $INC_there++;