diff options
author | Roman I Khimov <khimov@altell.ru> | 2010-11-22 17:23:55 +0300 |
---|---|---|
committer | Roman I Khimov <khimov@altell.ru> | 2010-12-28 22:50:40 +0300 |
commit | 264f7ab1f41cc86d29716619d67506c85223df71 (patch) | |
tree | cda0ceeaa1ef59fc6bd4e3f97e76e2ab2fade228 /recipes/perl/perl-5.10.1 | |
parent | 228a1481110bf8e522baca11fef3d682648236fd (diff) | |
download | openembedded-264f7ab1f41cc86d29716619d67506c85223df71.tar.gz |
perl: fix PERLCONFIGTARGET for multimach builds, move cpan vars
Multimachine builds race staging Config_heavy-target.pl to native directory.
Solve that by changing PERLCONFIGTARGET variable semantics, now it will
contain $TARGET_SYS. Change perl patch and stage functions accordingly.
Also, move PERLCONFIGTARGET and other target-specific variable settings from
cpan to cpan-base as I think they're also useful for cpan_build and anywhere
else cpan-base is needed.
Signed-off-by: Roman I Khimov <khimov@altell.ru>
Acked-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/perl/perl-5.10.1')
-rw-r--r-- | recipes/perl/perl-5.10.1/perl-configpm-switch.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes/perl/perl-5.10.1/perl-configpm-switch.patch b/recipes/perl/perl-5.10.1/perl-configpm-switch.patch index 1aacd35189..8becb8e33a 100644 --- a/recipes/perl/perl-5.10.1/perl-configpm-switch.patch +++ b/recipes/perl/perl-5.10.1/perl-configpm-switch.patch @@ -1,6 +1,6 @@ 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 +Config_heavy-$TARGET_SYS.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 @@ -24,9 +24,9 @@ values would be valid for the host only. sub AUTOLOAD { - require 'Config_heavy.pl'; + my $cfgfile = 'Config_heavy.pl'; -+ if (defined $ENV{PERLCONFIGTARGET} and $ENV{PERLCONFIGTARGET} eq "yes") ++ if (defined $ENV{PERLCONFIGTARGET} and $ENV{PERLCONFIGTARGET} ne "") + { -+ $cfgfile = 'Config_heavy-target.pl'; ++ $cfgfile = "Config_heavy-$ENV{PERLCONFIGTARGET}.pl"; + } + require $cfgfile; goto \&launcher unless $Config::AUTOLOAD =~ /launcher$/; |