diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-06-17 00:19:42 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-01 15:39:58 +0100 |
commit | 3f7e55baa6b65b39c5698bb58320f85876cebe23 (patch) | |
tree | 398e48b0e167f958d084ce1e8ccf25162ac9f0a8 /meta/recipes-devtools/perl/perl/perl-configpm-switch.patch | |
parent | a01d406f6b0d9e08ce6d7408c2928a433fdf1843 (diff) | |
download | poky-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/perl-configpm-switch.patch')
-rw-r--r-- | meta/recipes-devtools/perl/perl/perl-configpm-switch.patch | 47 |
1 files changed, 47 insertions, 0 deletions
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 @@ | |||
1 | Upstream-Status:Inappropriate [native] | ||
2 | |||
3 | This patch is used for perl-native only. It enables the switching of | ||
4 | configuration files between Config_heavy.pl and | ||
5 | Config_heavy-target.pl by setting the environment variables | ||
6 | PERLCONFIGTARGET - the later containing settings for the target while | ||
7 | the former contains those for the host. This will allow cpan.bbclass | ||
8 | to use the settings appropriate for the native and/or target builds | ||
9 | as required. This also disables the use of the cache since the cached | ||
10 | values would be valid for the host only. | ||
11 | |||
12 | Index: perl-5.14.2/configpm | ||
13 | =================================================================== | ||
14 | --- perl-5.14.2.orig/configpm | ||
15 | +++ perl-5.14.2/configpm | ||
16 | @@ -658,7 +658,7 @@ sub FETCH { | ||
17 | my($self, $key) = @_; | ||
18 | |||
19 | # check for cached value (which may be undef so we use exists not defined) | ||
20 | - return exists $self->{$key} ? $self->{$key} : $self->fetch_string($key); | ||
21 | + return $self->fetch_string($key); | ||
22 | } | ||
23 | |||
24 | ENDOFEND | ||
25 | @@ -816,7 +816,21 @@ $config_txt .= sprintf <<'ENDOFTIE', $fa | ||
26 | sub DESTROY { } | ||
27 | |||
28 | sub AUTOLOAD { | ||
29 | - require 'Config_heavy.pl'; | ||
30 | + my $cfgfile = 'Config_heavy.pl'; | ||
31 | + if (defined $ENV{PERLCONFIGTARGET} and $ENV{PERLCONFIGTARGET} eq "yes") | ||
32 | + { | ||
33 | + $cfgfile = 'Config_heavy-target.pl'; | ||
34 | + } | ||
35 | + if (defined $ENV{PERL_ARCHLIB}) | ||
36 | + { | ||
37 | + push @INC, $ENV{PERL_ARCHLIB}; | ||
38 | + require $cfgfile; | ||
39 | + pop @INC; | ||
40 | + } | ||
41 | + else | ||
42 | + { | ||
43 | + require $cfgfile; | ||
44 | + } | ||
45 | goto \&launcher unless $Config::AUTOLOAD =~ /launcher$/; | ||
46 | die "&Config::AUTOLOAD failed on $Config::AUTOLOAD"; | ||
47 | } | ||