From 8ba700a4c593fd52bd01b6272b4c8285a71964f7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 17 Mar 2011 22:40:15 -0700 Subject: 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 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] Signed-off-by: Khem Raj --- meta/recipes-devtools/perl/files/Configure-multilib.patch | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'meta/recipes-devtools/perl/files/Configure-multilib.patch') diff --git a/meta/recipes-devtools/perl/files/Configure-multilib.patch b/meta/recipes-devtools/perl/files/Configure-multilib.patch index d3948a92c..b561b6ab6 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" -- cgit v1.2.3