mirror of
https://git.yoctoproject.org/poky
synced 2026-03-06 07:19:39 +01:00
e73deac6dc
Changed: - The Copying has no change, except the company address. - pick patches from debian http://ftp.de.debian.org/debian/pool/main/p/perl/perl_5.20.0-1.debian.tar.xz - Not used by oe: deprecate-with-apt.diff patchlevel.diff fakeroot.diff - Create/Update perl-rdepends_${PV}.inc by the hardcode script; - Update config.sh by: 1) Copy the Perl 5.20.0 source code onto your TARGET machine linux qemuarm 3.14.5-yocto-standard from OE-Core rev: f506d0660c9949485268a92724ac770b5457b0ca 2) Execute sh Configure as normal and configure as required, do not "make"; 3) Compare with the old config.sh files, and update; - perl-ptest.inc 1) Copy the souce code to ptest since almost 112 test cases failed with the reason that no souce code found; 2) Add two patches to fix test case issue; - perl-native Reference perl (5.20.0-1) in debian to update perl shared library headers https://packages.debian.org/experimental/i386/perl/filelist Obsolete: - 09_fix_installperl.patch The dead code was removed from installperl http://perl5.git.perl.org/perl.git/commit/236818e0b9d9fe874831086b4d0b94dc6f245dfd - perl-build-in-t-dir.patch The upstream has fix it. The issue description: Perl cannot cross build in a path containing a directory that has the name of "t". As an example, you can make the perl build fail with "mkdir -p /tmp/build/t", go to the directory, unpack the sources, configure and cross build. - 0001-Fix-misparsing-of-maketext-strings.patch as they are part of the upstream code now: http://perl5.git.perl.org/perl.git/commit/1735f6f53ca19f99c6e9e39496c486af323ba6a8 - 0001-Prevent-premature-hsplit-calls-and-only-trigger-REHA.patch the hash function changed: http://perl5.git.perl.org/perl.git/commit/7dc8663964c66a698d31bbdc8e8abed69bddeec3 (From OE-Core rev: c7ac82415efc42ff7a93c6df163f88f2dde00d26) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
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";
|
|
}
|