summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl/perl/native-perlinc.patch
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/native-perlinc.patch
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/native-perlinc.patch')
-rw-r--r--meta/recipes-devtools/perl/perl/native-perlinc.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl/native-perlinc.patch b/meta/recipes-devtools/perl/perl/native-perlinc.patch
new file mode 100644
index 0000000000..f0bb1f6596
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/native-perlinc.patch
@@ -0,0 +1,26 @@
1Upstream-Status:Inappropriate [embedded specific]
2
3Index: perl-5.8.8/lib/ExtUtils/MM_Unix.pm
4===================================================================
5--- perl-5.12.3.orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 2008-10-31 22:01:35.000000000 +0000
6+++ perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 2008-10-31 22:01:35.000000000 +0000
7@@ -1597,6 +1597,19 @@
8 $self->{PERL_LIB} ||= $Config{privlibexp};
9 $self->{PERL_ARCHLIB} ||= $Config{archlibexp};
10 $self->{PERL_INC} = $self->catdir("$self->{PERL_ARCHLIB}","CORE"); # wild guess for now
11+ # Check for environment override so we'll find the headers in the correct place
12+ if (defined $ENV{PERL_LIB})
13+ {
14+ $self->{PERL_LIB} = $ENV{PERL_LIB};
15+ }
16+ if (defined $ENV{PERL_ARCHLIB})
17+ {
18+ $self->{PERL_ARCHLIB} = $ENV{PERL_ARCHLIB};
19+ }
20+ if (defined $ENV{PERL_INC})
21+ {
22+ $self->{PERL_INC} = $ENV{PERL_INC};
23+ }
24 my $perl_h;
25
26 if (not -f ($perl_h = $self->catfile($self->{PERL_INC},"perl.h"))