summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 @@
1make_ext.pl: fix regenerate makefile failed while $cc changed
2
3While $cc changed, the existance of 'xdefine' caused makefile
4regeneration failed.
5
6Upstream-Status: Pending
7
8Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
9---
10 make_ext.pl | 4 ++++
11 1 file changed, 4 insertions(+)
12
13diff --git a/make_ext.pl b/make_ext.pl
14index b433762..9fc1a36 100644
15--- a/make_ext.pl
16+++ b/make_ext.pl
17@@ -335,6 +335,10 @@ sub build_extension {
18 print "Deleting non-Cross makefile\n";
19 close $mfh or die "close $makefile: $!";
20 _unlink($makefile);
21+ if(-e 'xdefine') {
22+ print "Deleting xdefine for regenerate makefile\n";
23+ _unlink('xdefine');
24+ }
25 }
26 }
27 }
28--
291.8.1.2
30
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 += " \
74 file://config.sh-64-be \ 74 file://config.sh-64-be \
75 file://perl-5.14.3-fix-CVE-2010-4777.patch \ 75 file://perl-5.14.3-fix-CVE-2010-4777.patch \
76 file://0001-Makefile.SH-fix-do_install-failed.patch \ 76 file://0001-Makefile.SH-fix-do_install-failed.patch \
77 file://make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch \
77" 78"
78 79
79# Fix test case issues 80# Fix test case issues