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/generate-sh.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/generate-sh.patch')
-rw-r--r-- | meta/recipes-devtools/perl/perl-5.20.0/generate-sh.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/generate-sh.patch b/meta/recipes-devtools/perl/perl-5.20.0/generate-sh.patch new file mode 100644 index 0000000000..27f6e691c0 --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.20.0/generate-sh.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | Upstream-Status:Inappropriate [embedded specific] | ||
2 | |||
3 | Use the ld flags from the supplied configuration file. For sh we need the | ||
4 | flags that specify to build PIC code so that the shared libraries work. | ||
5 | |||
6 | Index: perl-5.14.2/Cross/generate_config_sh | ||
7 | =================================================================== | ||
8 | --- perl-5.14.2.orig/Cross/generate_config_sh 2010-12-30 04:07:14.000000000 +0200 | ||
9 | +++ perl-5.14.2/Cross/generate_config_sh 2012-11-22 15:58:49.852852805 +0200 | ||
10 | @@ -19,10 +19,10 @@ | ||
11 | $callbacks->{'ar'} = [\&simple_process, ["AR", "arm-linux-ar"]]; | ||
12 | $callbacks->{'archname'} = [\&simple_process, ["SYS", "armv4l-linux"]]; | ||
13 | $callbacks->{'cc'} = [\&simple_process, ["CC", "arm-linux-gcc"]]; | ||
14 | -$callbacks->{'cccdlflags'} = [\&simple_process, ["CFLAGS", ""]]; | ||
15 | -$callbacks->{'ccdlflags'} = [\&simple_process, ["CFLAGS", ""]]; | ||
16 | -$callbacks->{'ccflags'} = [\&simple_process, ["CFLAGS", "-fno-strict-aliasing -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"]]; | ||
17 | -$callbacks->{'ccflags_uselargefiles'} = [\&simple_process, ["CFLAGS", "-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"]]; | ||
18 | +#$callbacks->{'cccdlflags'} = [\&simple_process, ["CFLAGS", ""]]; | ||
19 | +#$callbacks->{'ccdlflags'} = [\&simple_process, ["CFLAGS", ""]]; | ||
20 | +$callbacks->{'ccflags'} = [\&simple_process_insert, ["CFLAGS", "-fno-strict-aliasing -D_GNU_SOURCE -DTHREADS_HAVE_PIDS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"]]; | ||
21 | +$callbacks->{'ccflags_uselargefiles'} = [\&simple_process_insert, ["CFLAGS", "-D_GNU_SOURCE -DTHREADS_HAVE_PIDS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"]]; | ||
22 | $callbacks->{'ccname'} = [\&simple_process, ["CC", "arm-linux-gcc"]]; | ||
23 | $callbacks->{'cpp'} = [\&simple_process, ["CCP", "arm-linux-cpp"]]; | ||
24 | $callbacks->{'cppflags'} = [\&simple_process, ["CCPFLAGS", "-fno-strict-aliasing"]]; | ||
25 | @@ -30,6 +30,7 @@ | ||
26 | $callbacks->{'cppstdin'} = [\&simple_process_append, ["CC", "arm-linux-gcc -E", "-E"]]; | ||
27 | $callbacks->{'full_ar'} = [\&backtick, ["AR", "which $ENV{AR}", "/usr/local/arm/2.95.3/bin/arm-linux-ar"]]; | ||
28 | $callbacks->{'ld'} = [\&simple_process, ["LD", "arm-linux-ld"]]; | ||
29 | +$callbacks->{'lddlflags'} = [\&simple_process, ["LDDLFLAGS", ""]]; | ||
30 | $callbacks->{'ldflags'} = [\&simple_process, ["LDFLAGS", ""]]; | ||
31 | $callbacks->{'ldflags_uselargefiles'} = [\&simple_process, ["LDFLAGS", ""]]; | ||
32 | $callbacks->{'myarchname'} = [\&simple_process, ["SYS", "armv4l-linux"]]; | ||
33 | @@ -105,6 +106,23 @@ | ||
34 | |||
35 | } | ||
36 | |||
37 | +# Insert env var into the variables value | ||
38 | +sub simple_process_insert { | ||
39 | + my $key = shift; | ||
40 | + my $value = shift; | ||
41 | + my $envvar = $callbacks->{$key}->[1][0]; | ||
42 | + | ||
43 | + if ($ENV{$envvar}) { | ||
44 | + # Strip quotes from value | ||
45 | + $value =~ s/^\'//; | ||
46 | + $value =~ s/\'$//; | ||
47 | + # Remove -I/usr/local/... from the value | ||
48 | + $value =~ s#\W-I/usr/local/\w+\W# #g; | ||
49 | + # Prepend env var (OE setting) to value | ||
50 | + print("$key=\'$ENV{$envvar} $value\'\n"); | ||
51 | + } | ||
52 | +} | ||
53 | + | ||
54 | sub library_munge { | ||
55 | my $key = shift; | ||
56 | my $value = shift; | ||