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

login
register
mail settings
Submitter Mei Lei
Date July 20, 2011, 8:48 a.m.
Message ID <93848d65e679794e5aa41e548ee275378518d071.1311151283.git.lei.mei@intel.com>
Download mbox | patch
Permalink /patch/8051/
State New, archived
Headers show

Comments

Mei Lei - July 20, 2011, 8:48 a.m.
The perl-dynloader.patch can't support /usr/lib64, change the regular expression to support multilib.

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(-)
Richard Purdie - July 20, 2011, 2:34 p.m.
On Wed, 2011-07-20 at 16:48 +0800, Mei Lei wrote:
> The perl-dynloader.patch can't support /usr/lib64, change the regular expression to support multilib.
> 
> 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(-)
> 
> 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..a45af91 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[0-9]*\/)?)((perl\/[0-9\.]*\/)?)(.*)$/;
>  +        print STDERR "*** p1: $p1  p3: $p3  p5: $p5\n";
>  +        if ( $p1 ne "" ) {
>  +            $modlibname = $hostlib.$p5;

We might need to relax this a little further since we might want things
like libx32 to work in future?

Cheers,

Richard
Mei Lei - July 21, 2011, 7:54 a.m.
>-----Original Message-----
>From: openembedded-core-bounces@lists.openembedded.org
>[mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
>Richard Purdie
>Sent: Wednesday, July 20, 2011 10:34 PM
>To: Patches and discussions about the oe-core layer
>Subject: Re: [OE-core] [PATCH 2/2] perl-dynloader.patch: Fix libdir issue for
>multilib
>
>On Wed, 2011-07-20 at 16:48 +0800, Mei Lei wrote:
>> The perl-dynloader.patch can't support /usr/lib64, change the regular
>expression to support multilib.
>>
>> 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(-)
>>
>> 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..a45af91 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[0-9]*\/)?)((perl\/[0-9\.]*\/)?)(.*)$/;
>>  +        print STDERR "*** p1: $p1  p3: $p3  p5: $p5\n";
>>  +        if ( $p1 ne "" ) {
>>  +            $modlibname = $hostlib.$p5;
>
>We might need to relax this a little further since we might want things
>like libx32 to work in future?

Hi Nitin,
	I am not sure what is the perl work style under libx32, can you supply some information about it?

Thanks
Lei


>
>Cheers,
>
>Richard
>
>
>
>_______________________________________________
>Openembedded-core mailing list
>Openembedded-core@lists.openembedded.org
>http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Nitin A Kamble - July 21, 2011, 3:57 p.m.
> -----Original Message-----
> From: Mei, Lei
> Sent: Thursday, July 21, 2011 12:54 AM
> To: Patches and discussions about the oe-core layer
> Cc: Kamble, Nitin A
> Subject: RE: [OE-core] [PATCH 2/2] perl-dynloader.patch: Fix libdir
> issue for multilib
> 
> 
> 
> >-----Original Message-----
> >From: openembedded-core-bounces@lists.openembedded.org
> >[mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> >Richard Purdie
> >Sent: Wednesday, July 20, 2011 10:34 PM
> >To: Patches and discussions about the oe-core layer
> >Subject: Re: [OE-core] [PATCH 2/2] perl-dynloader.patch: Fix libdir
> issue for
> >multilib
> >
> >On Wed, 2011-07-20 at 16:48 +0800, Mei Lei wrote:
> >> The perl-dynloader.patch can't support /usr/lib64, change the
> regular
> >expression to support multilib.
> >>
> >> 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(-)
> >>
> >> 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..a45af91 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[0-9]*\/)?)((perl\/[0-9\.]*\/)?)(.*)$/;
> >>  +        print STDERR "*** p1: $p1  p3: $p3  p5: $p5\n";
> >>  +        if ( $p1 ne "" ) {
> >>  +            $modlibname = $hostlib.$p5;
> >
> >We might need to relax this a little further since we might want
> things
> >like libx32 to work in future?
> 
> Hi Nitin,
> 	I am not sure what is the perl work style under libx32, can you
> supply some information about it?
> 
> Thanks
> Lei

Hi Lei,
  x32 would use libx32 as the lib dirname.
Thanks,
Nitin
> 
> 
> >
> >Cheers,
> >
> >Richard
> >
> >
> >
> >_______________________________________________
> >Openembedded-core mailing list
> >Openembedded-core@lists.openembedded.org
> >http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

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..a45af91 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[0-9]*\/)?)((perl\/[0-9\.]*\/)?)(.*)$/;
 +        print STDERR "*** p1: $p1  p3: $p3  p5: $p5\n";
 +        if ( $p1 ne "" ) {
 +            $modlibname = $hostlib.$p5;