summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2015-07-10 16:54:55 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-01 22:24:19 +0100
commitd2bf05fb55619e9bf43292a3b13ed7d802fc64bc (patch)
treeb5b201f7d1bf8bf455f089c615acb6de824b1111 /meta/recipes-devtools
parentaaf1033ad8c39df1fb949ad7ce660bab45231280 (diff)
downloadpoky-d2bf05fb55619e9bf43292a3b13ed7d802fc64bc.tar.gz
perl: fix build failure if building dir has the "blib" string
If build dir includes the string "blib", filter it out from @INC may empty the @INC and cause build errors like: Can't locate ExtUtils/MakeMaker.pm in @INC \ (you may need to install the ExtUtils::MakeMaker module) \ (@INC contains: .) at Makefile.PL (From OE-Core rev: cf2b41fd37c18d59e1fd309ac7693ad03599b08f) Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/perl/perl-native_5.22.0.bb1
-rw-r--r--meta/recipes-devtools/perl/perl/perl-PathTools-don-t-filter-out-blib-from-INC.patch33
-rw-r--r--meta/recipes-devtools/perl/perl_5.22.0.bb1
3 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-native_5.22.0.bb b/meta/recipes-devtools/perl/perl-native_5.22.0.bb
index dbcf2a6d49..a9a1cab942 100644
--- a/meta/recipes-devtools/perl/perl-native_5.22.0.bb
+++ b/meta/recipes-devtools/perl/perl-native_5.22.0.bb
@@ -8,6 +8,7 @@ SRC_URI += "\
8 file://MM_Unix.pm.patch \ 8 file://MM_Unix.pm.patch \
9 file://debian/errno_ver.diff \ 9 file://debian/errno_ver.diff \
10 file://dynaloaderhack.patch \ 10 file://dynaloaderhack.patch \
11 file://perl-PathTools-don-t-filter-out-blib-from-INC.patch \
11 " 12 "
12 13
13SRC_URI[md5sum] = "ff0f09b17de426eff323426cb140ee79" 14SRC_URI[md5sum] = "ff0f09b17de426eff323426cb140ee79"
diff --git a/meta/recipes-devtools/perl/perl/perl-PathTools-don-t-filter-out-blib-from-INC.patch b/meta/recipes-devtools/perl/perl/perl-PathTools-don-t-filter-out-blib-from-INC.patch
new file mode 100644
index 0000000000..7dd904140a
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/perl-PathTools-don-t-filter-out-blib-from-INC.patch
@@ -0,0 +1,33 @@
1From 90c252cecc38aed5d5faedb30485dd6eee2e54eb Mon Sep 17 00:00:00 2001
2From: Wenzong Fan <wenzong.fan@windriver.com>
3Date: Wed, 11 Feb 2015 15:14:40 +0800
4Subject: [PATCH] perl / PathTools: don't filter out blib from @INC
5
6If $TOPDIR includes the string "blib", filter it out from @INC may empty
7the @INC and cause build errors like:
8
9 Can't locate ExtUtils/MakeMaker.pm in @INC \
10 (you may need to install the ExtUtils::MakeMaker module) \
11 (@INC contains: .) at Makefile.PL
12
13Upstream-Status: Pending
14
15Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
16---
17 dist/PathTools/Makefile.PL | 3 ---
18 1 file changed, 3 deletions(-)
19
20diff --git a/dist/PathTools/Makefile.PL b/dist/PathTools/Makefile.PL
21index 1b21de4..f562cb2 100644
22--- a/dist/PathTools/Makefile.PL
23+++ b/dist/PathTools/Makefile.PL
24@@ -1,6 +1,3 @@
25-
26-BEGIN { @INC = grep {!/blib/} @INC }
27-
28 require 5.005;
29 use ExtUtils::MakeMaker;
30 WriteMakefile
31--
321.9.1
33
diff --git a/meta/recipes-devtools/perl/perl_5.22.0.bb b/meta/recipes-devtools/perl/perl_5.22.0.bb
index f72afa706f..e3a7f41886 100644
--- a/meta/recipes-devtools/perl/perl_5.22.0.bb
+++ b/meta/recipes-devtools/perl/perl_5.22.0.bb
@@ -61,6 +61,7 @@ SRC_URI += " \
61 file://t-run-switches.t-perl5-perl.patch \ 61 file://t-run-switches.t-perl5-perl.patch \
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" 65"
65 66
66# Fix test case issues 67# Fix test case issues