diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-17 16:48:59 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-18 11:21:40 +0100 |
commit | ce69c21707aa19ab8a3f6c07dc5a560671ab53a4 (patch) | |
tree | 5d67c99e58eaaa4555cce64238b544db70797d6a /meta/recipes-devtools/perl/files/perl-configpm-switch.patch | |
parent | a725d188b5d6b5d3c5cf21cc2f3070a0fe711e18 (diff) | |
download | openembedded-core-contrib-ce69c21707aa19ab8a3f6c07dc5a560671ab53a4.tar.gz |
perl: Move perl-sanity -> perl
This was moved during the perl cleanup, it can/should be moved back now as
its confusing too many people.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/files/perl-configpm-switch.patch')
-rw-r--r-- | meta/recipes-devtools/perl/files/perl-configpm-switch.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/files/perl-configpm-switch.patch b/meta/recipes-devtools/perl/files/perl-configpm-switch.patch new file mode 100644 index 0000000000..3c2cecb8c1 --- /dev/null +++ b/meta/recipes-devtools/perl/files/perl-configpm-switch.patch @@ -0,0 +1,57 @@ +From 7f313cac31c55cbe62a4d0cdfa8321cc05a8eb3a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Sun, 27 May 2007 21:04:11 +0000 +Subject: [PATCH] perl: 5.8.7 -> 5.8.8 (from OE) + +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. + +Upstream-Status: Inappropriate [native] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + +--- + configpm | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +diff --git a/configpm b/configpm +index 09c4a3b..6a0a680 100755 +--- a/configpm ++++ b/configpm +@@ -687,7 +687,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 +@@ -845,7 +845,21 @@ $config_txt .= sprintf <<'ENDOFTIE', $fast_config; + 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"; + } |