[PATCH] perl-native multilib patch for ubuntu 11.04

[PATCH] perl-native multilib patch for ubuntu 11.04

[George C. Huntington, III]

When I try to build perl-native under ubuntu 11.04 x86_64 from
2011.03-maintenance branch
it fails unless I cherry-pick
commit 86fde1fe0281cc8c9d2bf1012d8eff5e24a69e55  can we put this in
the 2011.03-maintenance branch?

cherry-pick: 86fde1fe0281cc8c9d2bf1012d8eff5e24a69e55
Tested-by: george huntington <george.huntingtoniii@gmail.com>




Original patch from Scott Ellis
Modified by US replacing `uname -m` by '*' to support non x86_64 targets
(based on recommendations on the mailing list)

Signed-off-by: Scott Ellis <scott@jumpnowtek.com>
Signed-off-by: Ulf Samuelsson <ulf.samuelsson@atmel.com>
---
 recipes/perl/files/ubuntu-11.04-multiarch.patch |   12 ++++++++++++
 recipes/perl/perl-native_5.10.1.bb              |    3 +++
 2 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/recipes/perl/files/ubuntu-11.04-multiarch.patch
b/recipes/perl/files/ubuntu-11.04-multiarch.patch
new file mode 100644
index 0000000..4f51eb3
--- /dev/null
+++ b/recipes/perl/files/ubuntu-11.04-multiarch.patch
@@ -0,0 +1,12 @@
+diff --git perl-5.10.1/Configure-orig perl-5.10.1/Configure
+index 5508fd2..8ee7dae 100755
+--- perl-5.10.1/Configure-orig
++++ perl-5.10.1/Configure
+@@ -1311,6 +1311,7 @@ glibpth="/lib /usr/lib /lib64 /usr/lib64 $xlibpth"
+ glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
+ test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
+ test -f /shlib/libc.so     && glibpth="/shlib $glibpth"
++test -f /usr/lib/*-linux-gnu/libc.so && glibpth="/usr/lib/*-linux-gnu
$glibpth"
+ test -d /usr/lib64         && glibpth="$glibpth /lib64 /usr/lib64
/usr/local/lib64"
+
+ : Private path used by Configure to find libraries.  Its value
diff --git a/recipes/perl/perl-native_5.10.1.bb b/recipes/perl/
perl-native_5.10.1.bb
index 5aa0c7b..3dafc10 100644
--- a/recipes/perl/perl-native_5.10.1.bb
+++ b/recipes/perl/perl-native_5.10.1.bb
@@ -20,6 +20,7 @@ SRC_URI = "
http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz;name=perl-${PV} \
            file://native-nopacklist.patch \
            file://native-perlinc.patch \
    file://perl-fix-cross-library-check.patch \
+           file://ubuntu-11.04-multiarch.patch \
    "

 SRC_URI[perl-5.10.1.md5sum] = "b9b2fdb957f50ada62d73f43ee75d044"
@@ -29,6 +30,8 @@ S = "${WORKDIR}/perl-${PV}"

 inherit native

+export LD="${CC}"
+
 do_configure () {
     ./Configure \
         -Dcc="${CC}" \
-- 
1.7.4.1

Re: [PATCH] perl-native multilib patch for ubuntu 11.04

[Tom Rini]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 06/01/2011 10:51 AM, George C. Huntington, III wrote:
> When I try to build perl-native under ubuntu 11.04 x86_64 from
> 2011.03-maintenance branch
> it fails unless I cherry-pick
> commit 86fde1fe0281cc8c9d2bf1012d8eff5e24a69e55  can we put this in
> the 2011.03-maintenance branch?
> 
> cherry-pick: 86fde1fe0281cc8c9d2bf1012d8eff5e24a69e55
> Tested-by: george huntington <george.huntingtoniii@gmail.com>

I've applied this.  Or rather, patchwork and pw-am.sh didn't agree this
would apply but I re-did the cherry-pick myself and added a note that
you did the testing and pushed it.  Thanks!

- -- 
Tom Rini
Mentor Graphics Corporation
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJN597UAAoJEI4NMjfc3nJxIZEIALmF7OIKlc5nfdWs+dBQkIDT
Ft9lybnSGegBYSMnsAhQzJ6PnP0L0T83Kiy9h+LBRLDm7WFnadnALlI3JfVpqpvc
n5offZe3cq8DMtt1Oky3BVy2RwkU5eGYq8NIkPVmOhYTIEphNk1ehrdFF8E75vqL
Lsc3PZ25StD1YzDHQxQS9QidegagYF71QeS8Yk80aPDYVBCiinT0KG7aVJeExIzo
asgMYG4k2JeLRVhMWgnyKVI8hZlQlGZQHCEk5DKCidG9l1jWkbspEh8wJfRZWzVP
DW/M3VPII1Bb5PgtnR0C4H5XxlvaxJ0Id7M6BP+oTH7Ssd6NT3ycylVugwHdFCI=
=GrZ2
-----END PGP SIGNATURE-----