multilib: Change hard coded /usr/lib path
cover multilib: Change hard coded /usr/lib path
This pull request fixes some hard coded /usr/lib path issues when building poky-lsb on qemux86-64, please review it.
Thanks,
Lei
The following changes since commit fa4bcfdb73167f8159b88e5a4d711c0d37627a70:
Darren Hart (1):
bb-matrix: correct BB and PM number canonicalization
are available in the git repository at:
git://git.pokylinux.org/poky-contrib lmei3/multilib-lsb
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lmei3/multilib-lsb
Mei Lei (2):
lsbsetup_1.0.bb: Change the hardcoded /usr/lib to support multilib perl-dynloader.patch: Fix libdir issue for multilib
.../perl/perl-5.12.3/perl-dynloader.patch | 2 +- meta/recipes-extended/lsb/lsbsetup_1.0.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
PATCH 1/2 lsbsetup_1.0.bb: Change the hardcoded /usr/lib to support multilib
--- meta/recipes-extended/lsb/lsbsetup_1.0.bb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-extended/lsb/lsbsetup_1.0.bb +1 -1
@@ -14,7 +14,7 @@ do_install() { install -d ${D}/usr/bin install -d ${D}/${sysconfdir} install -m 0755 ${S}/LSB_Setup.sh ${D}/usr/bin - install -d ${D}/usr/lib/lsb + install -d ${D}/${libdir}/lsb ln -sf ${base_sbindir}/chkconfig ${D}/${libdir}/lsb/install_initd ln -sf ${base_sbindir}/chkconfig ${D}/${libdir}/lsb/remove_initd ln -sf ${sbindir}/sendmail ${D}/${libdir}/sendmail
Signature · 1 line
1.6.3.3
Richard Purdie
AppliedRe: [PATCH 1/2] lsbsetup_1.0.bb: Change the hardcoded /usr/lib to support multilib
Quoted 10 lines · Mei Lei
Signed-off-by Mei Lei <[email protected]>--- meta/recipes-extended/lsb/lsbsetup_1.0.bb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)meta/recipes-extended/lsb/lsbsetup_1.0.bb +0
-0
meta/recipes-extended/lsb/lsbsetup_1.0.bb do_install() { · line 20
Quoted 8 lines
meta/recipes-extended/lsb/lsbsetup_1.0.bb +1
-1@@ -14,7 +14,7 @@ do_install() { install -d ${D}/usr/bin install -d ${D}/${sysconfdir} install -m 0755 ${S}/LSB_Setup.sh ${D}/usr/bin - install -d ${D}/usr/lib/lsb + install -d ${D}/${libdir}/lsb ln -sf ${base_sbindir}/chkconfig ${D}/${libdir}/lsb/install_initd ln -sf ${base_sbindir}/chkconfig ${D}/${libdir}/lsb/remove_initd ln -sf ${sbindir}/sendmail ${D}/${libdir}/sendmail
Merged to master, thanks.
Richard
PATCH 2/2 perl-dynloader.patch: Fix libdir issue for multilib
In reply to Mei LeiThe perl-dynloader.patch can't support /usr/lib64, change the regular expression to support multilib.
--- .../perl/perl-5.12.3/perl-dynloader.patch | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch +1 -1
@@ -19,7 +19,7 @@ Update by Nitin A Kamble <[email protected]> 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;
Signature · 1 line
1.6.3.3
Re: [PATCH 2/2] perl-dynloader.patch: Fix libdir issue for multilib
Quoted 12 lines · Mei Lei
The perl-dynloader.patch can't support
/usr/lib64, change the regular expression to support multilib.Signed-off-by Mei Lei <[email protected]>--- .../perl/perl-5.12.3/perl-dynloader.patch | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch +0
-0
meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch Update by Nitin A Kamble <[email protected]> 2011/04/21 · line 25
Quoted 8 lines
meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch +1
-1@@ -19,7 +19,7 @@ Update by Nitin A Kamble <[email protected]> 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
Re: [PATCH 2/2] perl-dynloader.patch: Fix libdir issue for multilib
Quoted 32 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] 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 multilibQuoted 1 line · Mei Lei
The perl-dynloader.patch can't support
/usr/lib64, change the regularexpression to support multilib.
Review
Quoted 7 lines
Signed-off-by Mei Lei <[email protected]>--- .../perl/perl-5.12.3/perl-dynloader.patch | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)(quoted diff) +0
-0
b/meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patchmeta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch Update by Nitin A Kamble <[email protected]>
Quoted 4 lines
index d5ea00f..a45af91 100644
meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch +0
-0@@ -19,7 +19,7 @@ Update by Nitin A Kamble <[email protected]>2011/04/21
meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch Update by Nitin A Kamble <[email protected]> 2011/04/21
Quoted 4 lines
meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch +0
-1+ { + my $hostlib = $ENV{PERLHOSTLIB}; + print STDERR "*** Module name IN: $modlibname\n"; -+ ($p1, $p2, $p3, $p4, $p5) = $modlibname =~m/(^(.*lib\/)?)((perl\/[0-9\.]*\/)?)(.*)$/;
Quoted 8 lines
meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch Update by Nitin A Kamble <[email protected]> · line 22
Quoted 1 line
meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch +1
-0++ ($p1, $p2, $p3, $p4, $p5) = $modlibname =~m/(^(.*lib[0-9]*\/)?)((perl\/[0-9\.]*\/)?)(.*)$/;
meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch Update by Nitin A Kamble <[email protected]> 2011/04/21 · line 25
Quoted 3 lines
meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch +0
-0+ 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
Quoted 11 lines
Cheers,
Richard
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [PATCH 2/2] perl-dynloader.patch: Fix libdir issue for multilib
Quoted 54 lines
-----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 multilibQuoted 7 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] 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 libdirissue for
Quoted 4 lines
multilib
Quoted 1 line · Mei Lei
The perl-dynloader.patch can't support
/usr/lib64, change theregular
Quoted 8 lines
expression to support multilib.
Review
Quoted 7 lines
Signed-off-by Mei Lei <[email protected]>--- .../perl/perl-5.12.3/perl-dynloader.patch | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)(quoted diff) +0
-0dynloader.patch
Quoted 5 lines
b/meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patchmeta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch Update by Nitin A Kamble
Quoted 4 lines
index d5ea00f..a45af91 100644
meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch +0
-0@@ -19,7 +19,7 @@ Update by Nitin A KambleQuoted 5 lines
2011/04/21
meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch Update by Nitin A Kamble <[email protected]> 2011/04/21
Quoted 4 lines
meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch +0
-1+ { + my $hostlib = $ENV{PERLHOSTLIB}; + print STDERR "*** Module name IN: $modlibname\n"; -+ ($p1, $p2, $p3, $p4, $p5) = $modlibname =~Quoted 8 lines
m/(^(.*lib\/)?)((perl\/[0-9\.]*\/)?)(.*)$/;
meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch Update by Nitin A Kamble · line 22
Quoted 1 line
meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch +1
-0++ ($p1, $p2, $p3, $p4, $p5) = $modlibname =~m/(^(.*lib[0-9]*\/)?)((perl\/[0-9\.]*\/)?)(.*)$/;
meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch Update by Nitin A Kamble <[email protected]> 2011/04/21 · line 25
Quoted 3 lines
meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch +0
-0+ 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
Quoted 8 lines
Quoted 1 line
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
Quoted 13 lines
Quoted 13 lines
Cheers,
Richard
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core