sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

perl-native: Update find_perl to find the perl wrapper 

[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.

(From OE-Core rev: f1d4fb02d9952138acab6d647ce8975363dfdbab)

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Wenzong Fan 2011-08-16 14:53:59 +08:00 committed by Richard Purdie
parent ce1f0286b9
commit d66c0672a4
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
meta/recipes-devtools/perl/perl-5.12.3/MM_Unix.pm.patch Normal file
View File

@ -0,0 +1,22 @@
Upstream-Status:Pending
The perl-native should be relocatable while re-use sstate-cache from
another build, especially the original build was renamed/removed.
To get the MakeMaker.pm works in this case, we need perl wrapper here
instead of real perl binary.
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
===================================================================
--- 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);

5
meta/recipes-devtools/perl/perl-native_5.12.3.bb
View File

@ -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"