diff options
author | Jeremy Puhlman <jpuhlman@mvista.com> | 2015-10-23 10:18:07 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-27 07:24:29 +0000 |
commit | 9b956c49131298ac326cb7a8baa209b34f1e1f0d (patch) | |
tree | 0741a377bafbc31f8cbb4657671a1af4124732d6 /meta | |
parent | 0f75740830488f6dbca57ec434d1c444d175e304 (diff) | |
download | poky-9b956c49131298ac326cb7a8baa209b34f1e1f0d.tar.gz |
Perl: Use CC version not $Config(gccversion)
Get version data from querying $CC rather then
$Config(gccversion) which comes from running version of
perl. Since perl-native is not likely compiled by gcc
5 at this point, it will never trigger the required
fixes for gcc 5.
[YOCTO #8367]
(From OE-Core rev: c616e05691ec143066df8f416cc0b6b464fabd02)
Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/perl/perl/perl-errno-generation-gcc5.patch | 23 | ||||
-rw-r--r-- | meta/recipes-devtools/perl/perl_5.22.0.bb | 1 |
2 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl/perl-errno-generation-gcc5.patch b/meta/recipes-devtools/perl/perl/perl-errno-generation-gcc5.patch new file mode 100644 index 0000000000..efbc55df29 --- /dev/null +++ b/meta/recipes-devtools/perl/perl/perl-errno-generation-gcc5.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | Upstream-Status:Inappropriate [embedded specific] | ||
2 | |||
3 | The upstream code assumes that the compiler version used to compiler miniperl/perl-native | ||
4 | is the same as the one being used to build the perl binary. Since most people are not running | ||
5 | systems with gcc 5, it is unlikely that it will work on any supported host. Switch out gccversion | ||
6 | for the version extracted from $CC --version. | ||
7 | |||
8 | --- perl-5.22.0/ext/Errno/Errno_pm.PL 2015-10-19 18:01:20.622143786 -0400 | ||
9 | +++ perl-5.22.0-fixed/ext/Errno/Errno_pm.PL 2015-10-19 17:50:35.662137367 -0400 | ||
10 | @@ -224,9 +224,12 @@ | ||
11 | |||
12 | { # BeOS (support now removed) did not enter this block | ||
13 | # invoke CPP and read the output | ||
14 | + my $compiler = $ENV{'CC'}; | ||
15 | + my $compiler_out = `$compiler --version`; | ||
16 | + my @compiler_version = split / /,$compiler_out; | ||
17 | |||
18 | my $inhibit_linemarkers = ''; | ||
19 | - if ($Config{gccversion} =~ /\A(\d+)\./ and $1 >= 5) { | ||
20 | + if (@compiler_version[2] =~ /\A(\d+)\./ and $1 >= 5) { | ||
21 | # GCC 5.0 interleaves expanded macros with line numbers breaking | ||
22 | # each line into multiple lines. RT#123784 | ||
23 | $inhibit_linemarkers = ' -P'; | ||
diff --git a/meta/recipes-devtools/perl/perl_5.22.0.bb b/meta/recipes-devtools/perl/perl_5.22.0.bb index 3ce7849f9e..66e074d37b 100644 --- a/meta/recipes-devtools/perl/perl_5.22.0.bb +++ b/meta/recipes-devtools/perl/perl_5.22.0.bb | |||
@@ -62,6 +62,7 @@ SRC_URI += " \ | |||
62 | file://ext-ODBM_File-hints-linux.pl-link-libgdbm_compat.patch \ | 62 | file://ext-ODBM_File-hints-linux.pl-link-libgdbm_compat.patch \ |
63 | file://ext-ODBM_File-t-odbm.t-fix-the-path-of-dbmt_common.p.patch \ | 63 | file://ext-ODBM_File-t-odbm.t-fix-the-path-of-dbmt_common.p.patch \ |
64 | file://perl-PathTools-don-t-filter-out-blib-from-INC.patch \ | 64 | file://perl-PathTools-don-t-filter-out-blib-from-INC.patch \ |
65 | file://perl-errno-generation-gcc5.patch \ | ||
65 | " | 66 | " |
66 | 67 | ||
67 | # Fix test case issues | 68 | # Fix test case issues |