summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl/perl-5.20.0/perl-configpm-switch.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.20.0/perl-configpm-switch.patch')
-rw-r--r--meta/recipes-devtools/perl/perl-5.20.0/perl-configpm-switch.patch47
1 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/perl-configpm-switch.patch b/meta/recipes-devtools/perl/perl-5.20.0/perl-configpm-switch.patch
new file mode 100644
index 0000000000..c6cc15c93f
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl-5.20.0/perl-configpm-switch.patch
@@ -0,0 +1,47 @@
1Upstream-Status:Inappropriate [native]
2
3This patch is used for perl-native only. It enables the switching of
4configuration files between Config_heavy.pl and
5Config_heavy-target.pl by setting the environment variables
6PERLCONFIGTARGET - the later containing settings for the target while
7the former contains those for the host. This will allow cpan.bbclass
8to use the settings appropriate for the native and/or target builds
9as required. This also disables the use of the cache since the cached
10values would be valid for the host only.
11
12Index: 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 }