[OE-core] [PATCH][resend] perl: fix build failure if building dir has the "blib" string

[Jussi Kukkonen]

On 10 July 2015 at 11:54,  <rongqing.li at windriver.com> wrote:
> From: Wenzong Fan <wenzong.fan at windriver.com>
>
> 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

The grep certainly looks overly zealous, but surely upstream has a
reason for having this code... If you're going to remove the code
altogether, you should mention why those original reasons do not apply
here.

Jussi

> Signed-off-by: Roy Li <rongqing.li at windriver.com>
> Signed-off-by: Wenzong Fan <wenzong.fan at windriver.com>
> ---
>  meta/recipes-devtools/perl/perl-native_5.22.0.bb   |  1 +
>  ...-PathTools-don-t-filter-out-blib-from-INC.patch | 33 ++++++++++++++++++++++
>  meta/recipes-devtools/perl/perl_5.22.0.bb          |  1 +
>  3 files changed, 35 insertions(+)
>  create mode 100644 meta/recipes-devtools/perl/perl/perl-PathTools-don-t-filter-out-blib-from-INC.patch
>
> 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 dbcf2a6..a9a1cab 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 += "\
>             file://MM_Unix.pm.patch \
>             file://debian/errno_ver.diff \
>             file://dynaloaderhack.patch \
> +           file://perl-PathTools-don-t-filter-out-blib-from-INC.patch \
>            "
>
>  SRC_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 0000000..7dd9041
> --- /dev/null
> +++ b/meta/recipes-devtools/perl/perl/perl-PathTools-don-t-filter-out-blib-from-INC.patch
> @@ -0,0 +1,33 @@
> +From 90c252cecc38aed5d5faedb30485dd6eee2e54eb Mon Sep 17 00:00:00 2001
> +From: Wenzong Fan <wenzong.fan at windriver.com>
> +Date: Wed, 11 Feb 2015 15:14:40 +0800
> +Subject: [PATCH] perl / PathTools: don't filter out blib from @INC
> +
> +If $TOPDIR 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
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Wenzong Fan <wenzong.fan at windriver.com>
> +---
> + dist/PathTools/Makefile.PL | 3 ---
> + 1 file changed, 3 deletions(-)
> +
> +diff --git a/dist/PathTools/Makefile.PL b/dist/PathTools/Makefile.PL
> +index 1b21de4..f562cb2 100644
> +--- a/dist/PathTools/Makefile.PL
> ++++ b/dist/PathTools/Makefile.PL
> +@@ -1,6 +1,3 @@
> +-
> +-BEGIN { @INC = grep {!/blib/} @INC }
> +-
> + require 5.005;
> + use ExtUtils::MakeMaker;
> + WriteMakefile
> +--
> +1.9.1
> +
> diff --git a/meta/recipes-devtools/perl/perl_5.22.0.bb b/meta/recipes-devtools/perl/perl_5.22.0.bb
> index 050a98c..7f78998 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 += " \
>          file://t-run-switches.t-perl5-perl.patch \
>          file://ext-ODBM_File-hints-linux.pl-link-libgdbm_compat.patch \
>          file://ext-ODBM_File-t-odbm.t-fix-the-path-of-dbmt_common.p.patch \
> +        file://perl-PathTools-don-t-filter-out-blib-from-INC.patch \
>  "
>
>  # Fix test case issues
> --
> 1.9.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core