summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-07-24 09:57:17 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-25 15:33:34 +0100
commitfa43d4f268bc4a6fafcf14029049f2997bc72d6c (patch)
tree34f2e4485b68fa0cbc1ebb59043a0ec24967171c
parent38d50331acbc1e279449ae6b313ff0116b6c44e8 (diff)
downloadopenembedded-core-contrib-fa43d4f268bc4a6fafcf14029049f2997bc72d6c.tar.gz
openembedded-core-contrib-fa43d4f268bc4a6fafcf14029049f2997bc72d6c.tar.bz2
openembedded-core-contrib-fa43d4f268bc4a6fafcf14029049f2997bc72d6c.zip
perl: fix rebuid failed while ${CC} changed
Reproduce steps: 1) bitbake perl 2) vim local.conf to tweak CC, just add redundant option. ... CC_append = " ${HOST_CC_ARCH}" ... 3) bitbake perl ... ./miniperl -Ilib make_ext.pl lib/auto/Time/HiRes/HiRes.so MAKE=make LIBPERL_A=libperl.so LINKTYPE=dynamic Making Time::HiRes (all)my $filename= Deleting non-Cross makefile Running Makefile.PL in cpan/Time-HiRes Makefile.PL: The "xdefine" exists, skipping the configure step. ("tmp/sysroots/x86_64-linux/usr/bin/perl-native/perl5.20.0.real Makefile.PL --configure" to force the configure step) Warning: No Makefile! make[2]: Entering directory `tmp/work/armv5te-poky-linux-gnueabi/perl/5.20.0-r1/perl-5.20.0/cpan/Time-HiRes' make[2]: *** No rule to make target `config'. Stop. ... While ${CC} changed, the existance of 'xdefine' caused makefile regeneration failed. [YOCTO #6569] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/perl/perl-5.20.0/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch30
-rw-r--r--meta/recipes-devtools/perl/perl_5.20.0.bb1
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch b/meta/recipes-devtools/perl/perl-5.20.0/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch
new file mode 100644
index 0000000000..de6f65294c
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl-5.20.0/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch
@@ -0,0 +1,30 @@
+make_ext.pl: fix regenerate makefile failed while $cc changed
+
+While $cc changed, the existance of 'xdefine' caused makefile
+regeneration failed.
+
+Upstream-Status: Pending
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ make_ext.pl | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/make_ext.pl b/make_ext.pl
+index b433762..9fc1a36 100644
+--- a/make_ext.pl
++++ b/make_ext.pl
+@@ -335,6 +335,10 @@ sub build_extension {
+ print "Deleting non-Cross makefile\n";
+ close $mfh or die "close $makefile: $!";
+ _unlink($makefile);
++ if(-e 'xdefine') {
++ print "Deleting xdefine for regenerate makefile\n";
++ _unlink('xdefine');
++ }
+ }
+ }
+ }
+--
+1.8.1.2
+
diff --git a/meta/recipes-devtools/perl/perl_5.20.0.bb b/meta/recipes-devtools/perl/perl_5.20.0.bb
index 4bd452512d..e984c906de 100644
--- a/meta/recipes-devtools/perl/perl_5.20.0.bb
+++ b/meta/recipes-devtools/perl/perl_5.20.0.bb
@@ -74,6 +74,7 @@ SRC_URI += " \
file://config.sh-64-be \
file://perl-5.14.3-fix-CVE-2010-4777.patch \
file://0001-Makefile.SH-fix-do_install-failed.patch \
+ file://make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch \
"
# Fix test case issues