diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2014-07-01 15:51:53 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-08 11:20:12 +0100 |
commit | e73deac6dc7861c64ced49d2a35f781d655db79a (patch) | |
tree | df7352dd791d9714ef62d4a6a87b64e2a90903e2 /meta/recipes-devtools/perl/perl-5.20.0/perl-configpm-switch.patch | |
parent | 93d77b6ca83e55f3ecbc09f5502d8ae928f2bd91 (diff) | |
download | poky-e73deac6dc7861c64ced49d2a35f781d655db79a.tar.gz |
perl, perl-native, perl-ptest: upgrade from 5.14.3 to 5.20.0
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>
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.20.0/perl-configpm-switch.patch')
-rw-r--r-- | meta/recipes-devtools/perl/perl-5.20.0/perl-configpm-switch.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/perl-configpm-switch.patch b/meta/recipes-devtools/perl/perl-5.20.0/perl-configpm-switch.patch new file mode 100644 index 0000000000..c6cc15c93f --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.20.0/perl-configpm-switch.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | Upstream-Status:Inappropriate [native] | ||
2 | |||
3 | This patch is used for perl-native only. It enables the switching of | ||
4 | configuration files between Config_heavy.pl and | ||
5 | Config_heavy-target.pl by setting the environment variables | ||
6 | PERLCONFIGTARGET - the later containing settings for the target while | ||
7 | the former contains those for the host. This will allow cpan.bbclass | ||
8 | to use the settings appropriate for the native and/or target builds | ||
9 | as required. This also disables the use of the cache since the cached | ||
10 | values would be valid for the host only. | ||
11 | |||
12 | Index: perl-5.14.2/configpm | ||
13 | =================================================================== | ||
14 | --- perl-5.14.2.orig/configpm | ||
15 | +++ perl-5.14.2/configpm | ||
16 | @@ -658,7 +658,7 @@ sub FETCH { | ||
17 | my($self, $key) = @_; | ||
18 | |||
19 | # check for cached value (which may be undef so we use exists not defined) | ||
20 | - return exists $self->{$key} ? $self->{$key} : $self->fetch_string($key); | ||
21 | + return $self->fetch_string($key); | ||
22 | } | ||
23 | |||
24 | ENDOFEND | ||
25 | @@ -816,7 +816,21 @@ $config_txt .= sprintf <<'ENDOFTIE', $fa | ||
26 | sub DESTROY { } | ||
27 | |||
28 | sub AUTOLOAD { | ||
29 | - require 'Config_heavy.pl'; | ||
30 | + my $cfgfile = 'Config_heavy.pl'; | ||
31 | + if (defined $ENV{PERLCONFIGTARGET} and $ENV{PERLCONFIGTARGET} eq "yes") | ||
32 | + { | ||
33 | + $cfgfile = 'Config_heavy-target.pl'; | ||
34 | + } | ||
35 | + if (defined $ENV{PERL_ARCHLIB}) | ||
36 | + { | ||
37 | + push @INC, $ENV{PERL_ARCHLIB}; | ||
38 | + require $cfgfile; | ||
39 | + pop @INC; | ||
40 | + } | ||
41 | + else | ||
42 | + { | ||
43 | + require $cfgfile; | ||
44 | + } | ||
45 | goto \&launcher unless $Config::AUTOLOAD =~ /launcher$/; | ||
46 | die "&Config::AUTOLOAD failed on $Config::AUTOLOAD"; | ||
47 | } | ||