summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl/perl-5.12.3
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2011-08-16 14:53:59 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-19 09:29:19 -0700
commitd66c0672a4a9fef298d52d9ce2eac70caefbf685 (patch)
tree695802e90c807d3278efe85ba0dda30bb33f6b0e /meta/recipes-devtools/perl/perl-5.12.3
parentce1f0286b90d953df12802e06f086c9ef0ba47cc (diff)
downloadpoky-d66c0672a4a9fef298d52d9ce2eac70caefbf685.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. (From OE-Core rev: f1d4fb02d9952138acab6d647ce8975363dfdbab) Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.12.3')
-rw-r--r--meta/recipes-devtools/perl/perl-5.12.3/MM_Unix.pm.patch22
1 files changed, 22 insertions, 0 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 @@
1Upstream-Status:Pending
2
3The perl-native should be relocatable while re-use sstate-cache from
4another build, especially the original build was renamed/removed.
5
6To get the MakeMaker.pm works in this case, we need perl wrapper here
7instead of real perl binary.
8
9Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
10===================================================================
11--- perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.orig 2011-08-12 16:07:30.000000000 +0800
12+++ perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 2011-08-12 16:08:56.000000000 +0800
13@@ -1019,6 +1019,9 @@
14 }
15
16 foreach my $name (@$names){
17+ # Getting MakeMaker.pm use perl wrapper instead of 'perl.real' directly
18+ $name =~ s/perl\.real/perl/ if ($name =~ /perl\.real/);
19+
20 foreach my $dir (@$dirs){
21 next unless defined $dir; # $self->{PERL_SRC} may be undefined
22 my ($abs, $val);