diff options
| author |   Wenzong Fan <wenzong.fan@windriver.com> | 2011-08-16 14:53:59 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-19 09:05:51 -0700 |
| commit | f1d4fb02d9952138acab6d647ce8975363dfdbab (patch) | |
| tree | 4ada9502974e9a38e56afe6f469e978bf21f9662 /meta/recipes-devtools/perl | |
| parent | 0d883b5df25635fbad45191d297cbdf78a6c1fe0 (diff) | |
| download | openembedded-core-f1d4fb02d9952138acab6d647ce8975363dfdbab.tar.gz | |
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.
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Diffstat (limited to 'meta/recipes-devtools/perl')
| -rw-r--r-- | meta/recipes-devtools/perl/perl-5.12.3/MM_Unix.pm.patch | 22 | ||||
| -rw-r--r-- | meta/recipes-devtools/perl/perl-native_5.12.3.bb | 5 |
2 files changed, 25 insertions, 2 deletions
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 0000000000..eb92ccb678 --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.12.3/MM_Unix.pm.patch @@ -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); 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 945ebd4ba1..a8e2346606 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" |