From 5f8f114e4cc29e96942f96ef7dec6d25e18b6d4f Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Wed, 19 Oct 2011 14:53:17 -0700 Subject: 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 Signed-off-by: Richard Purdie --- .../perl/perl-5.14.2/perl-configpm-switch.patch | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 meta/recipes-devtools/perl/perl-5.14.2/perl-configpm-switch.patch (limited to 'meta/recipes-devtools/perl/perl-5.14.2/perl-configpm-switch.patch') 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 @@ +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