diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-10-19 14:53:17 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-24 17:27:14 +0100 |
commit | 5f8f114e4cc29e96942f96ef7dec6d25e18b6d4f (patch) | |
tree | 5b7867dec533d001ce29d8bf7b4869299cea254f /meta/recipes-devtools/perl/perl-5.14.2/perl-configpm-switch.patch | |
parent | 53f7342562a66d1b14ecee234aa76be07951dedc (diff) | |
download | poky-5f8f114e4cc29e96942f96ef7dec6d25e18b6d4f.tar.gz |
perl: upgrade from 5.12.3 to 5.14.2
parallel build fix patches are not needed as they are upstream now.
Got a new set of debian patch set for 5.14.2
perl-rpdepends: fix the autogenerated rdepends mistakes
take out some mdoules which are not going to be built.
[Saul Wold: Remove debug]
(From OE-Core rev: 8dc5f118832a4aca906239ffed82f72497c37f8e)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.14.2/perl-configpm-switch.patch')
-rw-r--r-- | meta/recipes-devtools/perl/perl-5.14.2/perl-configpm-switch.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.14.2/perl-configpm-switch.patch b/meta/recipes-devtools/perl/perl-5.14.2/perl-configpm-switch.patch new file mode 100644 index 0000000000..c6cc15c93f --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.14.2/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 | } | ||