Patchwork [1/1] perl-dynloader.patch: Fix multilib issue for perl

login
register
mail settings
Submitter Mei Lei
Date July 25, 2011, 2:13 a.m.
Message ID <652d45839982a56f3e70b8533a3ef655f33e4eef.1311558123.git.lei.mei@intel.com>
Download mbox | patch
Permalink /patch/8405/
State New, archived
Headers show

Comments

Mei Lei - July 25, 2011, 2:13 a.m.
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>
---
 .../perl/perl-5.12.3/perl-dynloader.patch          |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch b/meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch
index d5ea00f..1840605 100644
--- a/meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch
+++ b/meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch
@@ -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;