From 3f7e55baa6b65b39c5698bb58320f85876cebe23 Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Wed, 17 Jun 2015 00:19:42 -0700
Subject: 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>
---
 .../perl/perl/perl-configpm-switch.patch           | 47 ++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 meta/recipes-devtools/perl/perl/perl-configpm-switch.patch

(limited to 'meta/recipes-devtools/perl/perl/perl-configpm-switch.patch')

diff --git a/meta/recipes-devtools/perl/perl/perl-configpm-switch.patch b/meta/recipes-devtools/perl/perl/perl-configpm-switch.patch
new file mode 100644
index 0000000000..c6cc15c93f
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/perl-configpm-switch.patch
@@ -0,0 +1,47 @@
+Upstream-Status:Inappropriate [native]
+
+This patch is used for perl-native only. It enables the switching of
+configuration files between Config_heavy.pl and
+Config_heavy-target.pl by setting the environment variables
+PERLCONFIGTARGET - the later containing settings for the target while
+the former contains those for the host. This will allow cpan.bbclass
+to use the settings appropriate for the native and/or target builds
+as required. This also disables the use of the cache since the cached
+values would be valid for the host only.
+
+Index: perl-5.14.2/configpm
+===================================================================
+--- perl-5.14.2.orig/configpm
++++ perl-5.14.2/configpm
+@@ -658,7 +658,7 @@ sub FETCH {
+     my($self, $key) = @_;
+ 
+     # check for cached value (which may be undef so we use exists not defined)
+-    return exists $self->{$key} ? $self->{$key} : $self->fetch_string($key);
++    return $self->fetch_string($key);
+ }
+ 
+ ENDOFEND
+@@ -816,7 +816,21 @@ $config_txt .= sprintf <<'ENDOFTIE', $fa
+ sub DESTROY { }
+ 
+ sub AUTOLOAD {
+-    require 'Config_heavy.pl';
++    my $cfgfile = 'Config_heavy.pl';
++    if (defined $ENV{PERLCONFIGTARGET} and $ENV{PERLCONFIGTARGET} eq "yes")
++    {
++        $cfgfile = 'Config_heavy-target.pl';
++    }
++    if (defined $ENV{PERL_ARCHLIB})
++    {
++        push @INC, $ENV{PERL_ARCHLIB};
++        require $cfgfile;
++        pop @INC;
++    }
++    else
++    {
++        require $cfgfile;
++    }
+     goto \&launcher unless $Config::AUTOLOAD =~ /launcher$/;
+     die "&Config::AUTOLOAD failed on $Config::AUTOLOAD";
+ }
-- 
cgit v1.2.3-54-g00ecf