]> code.ossystems Code Review - openembedded-core.git/commitdiff
perl-dynloader.patch: Fix multilib issue for perl
authorMei Lei <lei.mei@intel.com>
Mon, 25 Jul 2011 02:13:17 +0000 (10:13 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 25 Jul 2011 13:13:20 +0000 (14:13 +0100)
The perl-dynloader.patch can't support lib64 lib32, libx32, etc.
Relax the regular expression to fix this issue.

Signed-off-by: Mei Lei <lei.mei@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch

index d5ea00f2da399c55f3f00aa7a40c3198ae6f18b1..1840605df122ee0ac3bf73dd14aeb5158cc1295a 100644 (file)
@@ -19,7 +19,7 @@ Update by Nitin A Kamble <nitin.a.kamble@intel.com> 2011/04/21
 +    {
 +        my $hostlib = $ENV{PERLHOSTLIB};
 +        print STDERR "*** Module name IN: $modlibname\n";
-+        ($p1, $p2, $p3, $p4, $p5) = $modlibname =~ m/(^(.*lib\/)?)((perl\/[0-9\.]*\/)?)(.*)$/;
++        ($p1, $p2, $p3, $p4, $p5) = $modlibname =~ m/(^(.*lib\w*\/)?)((perl\/[0-9\.]*\/)?)(.*)$/;
 +        print STDERR "*** p1: $p1  p3: $p3  p5: $p5\n";
 +        if ( $p1 ne "" ) {
 +            $modlibname = $hostlib.$p5;