diff options
author | Jamie Lenehan <lenehan@twibble.org> | 2007-04-30 04:06:31 +0000 |
---|---|---|
committer | Jamie Lenehan <lenehan@twibble.org> | 2007-04-30 04:06:31 +0000 |
commit | bca1af865658a00eb25d22c0fb22b8fecc745813 (patch) | |
tree | e342293ca7717835f82ccad62121f087bc6caa81 /packages/perl/perl-5.8.8/perl-configpm-switch.patch | |
parent | 21174316f8181c882e6816b923ad2ca81c3778a2 (diff) |
perl 5.8.8: Improvements for cpan modules:
* Modify perl to install a copy of it's configuration during staging. This
will allow us to get at the perl settings for the target when building
cpan modules.
* Modify perl-native to allow selection of the host or target configuration
based on an environment variable. This will allow the cpan class to select
the appropriate configuration based on if we are building the native
package or not.
* Modify cpan.bbclass to set the environment variable to an appropriate
value to tell perl native to select the appropriate settings based on if
we are building native or target modules.
This change fixes some modules that were compiled for the host instead of
the target (libversion-perl for example) and fixes up some of cpan modules
that include additional subdirectories with their own makefiles.
Diffstat (limited to 'packages/perl/perl-5.8.8/perl-configpm-switch.patch')
-rw-r--r-- | packages/perl/perl-5.8.8/perl-configpm-switch.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/packages/perl/perl-5.8.8/perl-configpm-switch.patch b/packages/perl/perl-5.8.8/perl-configpm-switch.patch new file mode 100644 index 0000000000..1aacd35189 --- /dev/null +++ b/packages/perl/perl-5.8.8/perl-configpm-switch.patch @@ -0,0 +1,34 @@ +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. + +--- perl-5.8.8/configpm 2007/04/30 03:10:43 1.1 ++++ perl-5.8.8/configpm 2007/04/30 03:11:56 +@@ -374,7 +374,7 @@ + my($self, $key) = @_; + + # check for cached value (which may be undef so we use exists not defined) +- return $self->{$key} if exists $self->{$key}; ++ #return $self->{$key} if exists $self->{$key}; + + return $self->fetch_string($key); + } +@@ -530,7 +530,12 @@ + 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'; ++ } ++ require $cfgfile; + goto \&launcher unless $Config::AUTOLOAD =~ /launcher$/; + die "&Config::AUTOLOAD failed on $Config::AUTOLOAD"; + } |