[OE-core] [PATCH 1/1] perl-native: Update 'find_perl()' to find the perl wrapper

[Saul Wold]

On 08/16/2011 12:56 AM, wenzong.fan at windriver.com wrote:
> From: Wenzong Fan<wenzong.fan at windriver.com>
>
> [YOCTO #1157] [YOCTO #829]
>
> This is a common issue to the packages which using 'MakeMaker.pm' to
> generate their Makefiles. The function 'find_perl()' in 'MM_Unix.pm'
> will be used to figure out the path/link of 'PERL/FULLPERL', but it
> always find the 'perl.real' instead of perl wrapper.
>
> Just update it to find the perl wrapper correctly.

Should the be looking for the perl_native directory?

See additional comment about patch header below.

Thanks

Sau!
>
> Signed-off-by: Wenzong Fan<wenzong.fan at windriver.com>
> ---
>   .../perl/perl-5.12.3/MM_Unix.pm.patch              |   12 ++++++++++++
>   meta/recipes-devtools/perl/perl-native_5.12.3.bb   |    5 +++--
>   2 files changed, 15 insertions(+), 2 deletions(-)
>   create mode 100644 meta/recipes-devtools/perl/perl-5.12.3/MM_Unix.pm.patch
>
> diff --git a/meta/recipes-devtools/perl/perl-5.12.3/MM_Unix.pm.patch b/meta/recipes-devtools/perl/perl-5.12.3/MM_Unix.pm.patch
> new file mode 100644
> index 0000000..7a6e02d
> --- /dev/null
> +++ b/meta/recipes-devtools/perl/perl-5.12.3/MM_Unix.pm.patch

This needs a patch header with a Signed-off-by and Upstream-Status as 
per the guidelines:

http://wiki.openembedded.org/index.php/Commit_Patch_Message_Guidelines


> @@ -0,0 +1,12 @@
> +--- perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.orig	2011-08-12 16:07:30.000000000 +0800
> ++++ perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm	2011-08-12 16:08:56.000000000 +0800
> +@@ -1019,6 +1019,9 @@
> +     }
> +
> +     foreach my $name (@$names){
> ++        # Getting MakeMaker.pm use perl wrapper instead of 'perl.real' directly
> ++        $name =~ s/perl\.real/perl/ if ($name =~ /perl\.real/);
> ++
> +         foreach my $dir (@$dirs){
> +             next unless defined $dir; # $self->{PERL_SRC} may be undefined
> +             my ($abs, $val);
> diff --git a/meta/recipes-devtools/perl/perl-native_5.12.3.bb b/meta/recipes-devtools/perl/perl-native_5.12.3.bb
> index 945ebd4..a8e2346 100644
> --- a/meta/recipes-devtools/perl/perl-native_5.12.3.bb
> +++ b/meta/recipes-devtools/perl/perl-native_5.12.3.bb
> @@ -4,7 +4,7 @@ SECTION = "libs"
>   LICENSE = "Artistic|GPL"
>   LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
>   		    file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
> -PR = "r4"
> +PR = "r5"
>
>   LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
>                       file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
> @@ -19,7 +19,8 @@ SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
>              file://parallel_build_fix_5.patch \
>              file://parallel_build_fix_6.patch \
>              file://native-nopacklist.patch \
> -           file://native-perlinc.patch"
> +           file://native-perlinc.patch \
> +           file://MM_Unix.pm.patch"
>
>   SRC_URI[md5sum] = "29975a69dce54e47fcd6331c085c6c99"
>   SRC_URI[sha256sum] = "5678bfd5c2cd59253a26171bf3e681235433b00c730eea8a8046e1b225c11d2f"