diff options
| author | Khem Raj <raj.khem@gmail.com> | 2011-03-17 22:40:15 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-23 15:43:59 +0000 |
| commit | 0af5e136678c4735c85f81538a11fb5e6c489b9d (patch) | |
| tree | 610cf825e6db89e1815d8f07a2c17ca83d057d0d /meta/recipes-devtools/perl | |
| parent | 112f153a6059e761dcc016fd68e4fe5f7ffdac8c (diff) | |
| download | ast2050-yocto-poky-0af5e136678c4735c85f81538a11fb5e6c489b9d.zip ast2050-yocto-poky-0af5e136678c4735c85f81538a11fb5e6c489b9d.tar.gz | |
perl-native_5.12.2.bb: Fix compliation on ubuntu 11.04-alpha
Ubuntu has moved eglibc to /usr/lib/${arch}-linux-gnu and
/lib/${arch}-linux-gnu so we need that to be added to glibpth in
Configure.
Currently we set LD=ld in environment for recipes inheriting native
class. This overrides the LD settings in the Makefiles of perl and
it tries to link by calling ld which does not work since its using
-l<x> on commandline and ubuntu linker seems not to look into
the new location for these libraries. Its better to use gcc for linking
here anyway
[With tweak from Tom Rini to use CCLD, not LD]
(From OE-Core rev: 8ba700a4c593fd52bd01b6272b4c8285a71964f7)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl')
| -rw-r--r-- | meta/recipes-devtools/perl/files/Configure-multilib.patch | 10 | ||||
| -rw-r--r-- | meta/recipes-devtools/perl/perl-native_5.12.2.bb | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/meta/recipes-devtools/perl/files/Configure-multilib.patch b/meta/recipes-devtools/perl/files/Configure-multilib.patch index d3948a9..b561b6a 100644 --- a/meta/recipes-devtools/perl/files/Configure-multilib.patch +++ b/meta/recipes-devtools/perl/files/Configure-multilib.patch @@ -1,11 +1,15 @@ ---- perl-5.8.7/Configure.orig 2006-01-30 10:50:04.000000000 +0000 -+++ perl-5.8.7/Configure 2006-01-30 10:51:18.000000000 +0000 -@@ -1240,7 +1240,7 @@ +Index: perl-5.12.2/Configure +=================================================================== +--- perl-5.12.2.orig/Configure ++++ perl-5.12.2/Configure +@@ -1316,8 +1316,9 @@ loclibpth="/usr/local/lib /opt/local/lib loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" : general looking path for locating libraries -glibpth="/lib /usr/lib $xlibpth" +glibpth="/lib /usr/lib /lib64 /usr/lib64 $xlibpth" glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" ++test -f /usr/lib/`uname -m`-linux-gnu/libc.so && glibpth="/usr/lib/`uname -m`-linux-gnu $glibpth" test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" test -f /shlib/libc.so && glibpth="/shlib $glibpth" + test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" diff --git a/meta/recipes-devtools/perl/perl-native_5.12.2.bb b/meta/recipes-devtools/perl/perl-native_5.12.2.bb index 9af7b06..c9882a9 100644 --- a/meta/recipes-devtools/perl/perl-native_5.12.2.bb +++ b/meta/recipes-devtools/perl/perl-native_5.12.2.bb @@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8" -PR = "r7" +PR = "r8" LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8" @@ -28,6 +28,8 @@ S = "${WORKDIR}/perl-${PV}" inherit native +export LD="${CCLD}" + do_configure () { ./Configure \ -Dcc="${CC}" \ |
