diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2015-11-09 18:48:29 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-25 07:50:31 +0000 |
commit | b4e6f6345b97361b9fa6cd87f76a09c4a7063dc9 (patch) | |
tree | d0b253205034a12401f9c33f40259ec77aafdfb4 /meta/recipes-devtools/perl | |
parent | a59d019372362da126f3fb4570723081d0f2359a (diff) | |
download | poky-b4e6f6345b97361b9fa6cd87f76a09c4a7063dc9.tar.gz |
perl: fix spaces in brackets while using CC version
Here is the way to reproduce the issue:
...
root@localhost:~# perl -e "use Errno qw(ENOENT);"
"ENOENT" is not exported by the Errno module
Can't continue after import errors at -e line 1.
BEGIN failed--compilation aborted at -e line 1.
...
For some distros, there was extra spaces in the
brackets while using CC version:
For Windriver:
$CC --version
x86_64-wrs-linux-gcc (Wind River Linux 5.2.0-8.0-intel-x86-64) 5.2.0
For Ubuntu:
$ gcc --version
gcc (Ubuntu 4.8.4-2ubuntu1~14.04) 4.8.4
So we replace the contects between brackets with semicolon
and then use space to split.
[YOCTO #8367]
(From OE-Core rev: 115bf201a775410121d2f9769a4a5bb909cac5fd)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl')
-rw-r--r-- | meta/recipes-devtools/perl/perl/perl-errno-generation-gcc5.patch | 20 |
1 files changed, 17 insertions, 3 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 index efbc55df29..7379d8b814 100644 --- a/meta/recipes-devtools/perl/perl/perl-errno-generation-gcc5.patch +++ b/meta/recipes-devtools/perl/perl/perl-errno-generation-gcc5.patch | |||
@@ -5,14 +5,25 @@ is the same as the one being used to build the perl binary. Since most people ar | |||
5 | systems with gcc 5, it is unlikely that it will work on any supported host. Switch out gccversion | 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. | 6 | for the version extracted from $CC --version. |
7 | 7 | ||
8 | --- perl-5.22.0/ext/Errno/Errno_pm.PL 2015-10-19 18:01:20.622143786 -0400 | 8 | Jeremy Puhlman <jpuhlman@mvista.com> |
9 | +++ perl-5.22.0-fixed/ext/Errno/Errno_pm.PL 2015-10-19 17:50:35.662137367 -0400 | 9 | |
10 | @@ -224,9 +224,12 @@ | 10 | Fix spaces in brackets while running $CC --version |
11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
12 | --- | ||
13 | ext/Errno/Errno_pm.PL | 6 +++++- | ||
14 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL | ||
17 | index 1fd29d0..7976ea2 100644 | ||
18 | --- a/ext/Errno/Errno_pm.PL | ||
19 | +++ b/ext/Errno/Errno_pm.PL | ||
20 | @@ -224,9 +224,13 @@ sub write_errno_pm { | ||
11 | 21 | ||
12 | { # BeOS (support now removed) did not enter this block | 22 | { # BeOS (support now removed) did not enter this block |
13 | # invoke CPP and read the output | 23 | # invoke CPP and read the output |
14 | + my $compiler = $ENV{'CC'}; | 24 | + my $compiler = $ENV{'CC'}; |
15 | + my $compiler_out = `$compiler --version`; | 25 | + my $compiler_out = `$compiler --version`; |
26 | + $compiler_out =~ s/\(.*\)/;/; | ||
16 | + my @compiler_version = split / /,$compiler_out; | 27 | + my @compiler_version = split / /,$compiler_out; |
17 | 28 | ||
18 | my $inhibit_linemarkers = ''; | 29 | my $inhibit_linemarkers = ''; |
@@ -21,3 +32,6 @@ for the version extracted from $CC --version. | |||
21 | # GCC 5.0 interleaves expanded macros with line numbers breaking | 32 | # GCC 5.0 interleaves expanded macros with line numbers breaking |
22 | # each line into multiple lines. RT#123784 | 33 | # each line into multiple lines. RT#123784 |
23 | $inhibit_linemarkers = ' -P'; | 34 | $inhibit_linemarkers = ' -P'; |
35 | -- | ||
36 | 1.9.1 | ||
37 | |||