summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-03-17 22:40:15 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-23 15:43:59 +0000
commit0af5e136678c4735c85f81538a11fb5e6c489b9d (patch)
tree610cf825e6db89e1815d8f07a2c17ca83d057d0d
parent112f153a6059e761dcc016fd68e4fe5f7ffdac8c (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-devtools/perl/files/Configure-multilib.patch10
-rw-r--r--meta/recipes-devtools/perl/perl-native_5.12.2.bb4
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 d3948a92c0..b561b6ab6f 100644
--- a/meta/recipes-devtools/perl/files/Configure-multilib.patch
+++ b/meta/recipes-devtools/perl/files/Configure-multilib.patch
@@ -1,11 +1,15 @@
1--- perl-5.8.7/Configure.orig 2006-01-30 10:50:04.000000000 +0000 1Index: perl-5.12.2/Configure
2+++ perl-5.8.7/Configure 2006-01-30 10:51:18.000000000 +0000 2===================================================================
3@@ -1240,7 +1240,7 @@ 3--- perl-5.12.2.orig/Configure
4+++ perl-5.12.2/Configure
5@@ -1316,8 +1316,9 @@ loclibpth="/usr/local/lib /opt/local/lib
4 loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" 6 loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
5 7
6 : general looking path for locating libraries 8 : general looking path for locating libraries
7-glibpth="/lib /usr/lib $xlibpth" 9-glibpth="/lib /usr/lib $xlibpth"
8+glibpth="/lib /usr/lib /lib64 /usr/lib64 $xlibpth" 10+glibpth="/lib /usr/lib /lib64 /usr/lib64 $xlibpth"
9 glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" 11 glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
12+test -f /usr/lib/`uname -m`-linux-gnu/libc.so && glibpth="/usr/lib/`uname -m`-linux-gnu $glibpth"
10 test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" 13 test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
11 test -f /shlib/libc.so && glibpth="/shlib $glibpth" 14 test -f /shlib/libc.so && glibpth="/shlib $glibpth"
15 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 9af7b06e08..c9882a9101 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"
4LICENSE = "Artistic|GPL" 4LICENSE = "Artistic|GPL"
5LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ 5LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
6 file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8" 6 file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
7PR = "r7" 7PR = "r8"
8 8
9LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ 9LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
10 file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8" 10 file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
@@ -28,6 +28,8 @@ S = "${WORKDIR}/perl-${PV}"
28 28
29inherit native 29inherit native
30 30
31export LD="${CCLD}"
32
31do_configure () { 33do_configure () {
32 ./Configure \ 34 ./Configure \
33 -Dcc="${CC}" \ 35 -Dcc="${CC}" \