From 70505879094cb83cf788ec791d234e366f2bbb7f 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] (From OE-Core rev: 8ba700a4c593fd52bd01b6272b4c8285a71964f7) (From OE-Core rev: 9260c1b9d04a88d15ab5376c7cd56f381fe3e53b) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie Further tweaks to Configure-multilib.patch for x86_64 vs x86 from Gary Thomas Cc: gary@mlbassoc.com Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/files/Configure-multilib.patch | 15 +++++++++++++++ meta/recipes-devtools/perl/perl-native_5.12.3.bb | 10 +++++----- 2 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-devtools/perl/files/Configure-multilib.patch (limited to 'meta/recipes-devtools/perl') diff --git a/meta/recipes-devtools/perl/files/Configure-multilib.patch b/meta/recipes-devtools/perl/files/Configure-multilib.patch new file mode 100644 index 0000000000..545a8b821d --- /dev/null +++ b/meta/recipes-devtools/perl/files/Configure-multilib.patch @@ -0,0 +1,15 @@ +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/*-linux-gnu/libc.so && glibpth="/usr/lib/*-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.3.bb b/meta/recipes-devtools/perl/perl-native_5.12.3.bb index 0b0c9491c6..0476bdf5c4 100644 --- a/meta/recipes-devtools/perl/perl-native_5.12.3.bb +++ b/meta/recipes-devtools/perl/perl-native_5.12.3.bb @@ -4,22 +4,22 @@ SECTION = "libs" LICENSE = "Artistic|GPL" LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8" -PR = "r0" +PR = "r1" LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8" SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \ - file://Configure-multilib.patch;patch=1 \ - file://perl-configpm-switch.patch;patch=1 \ + file://Configure-multilib.patch \ + file://perl-configpm-switch.patch \ file://parallel_build_fix_1.patch \ file://parallel_build_fix_2.patch \ file://parallel_build_fix_3.patch \ file://parallel_build_fix_4.patch \ file://parallel_build_fix_5.patch \ file://parallel_build_fix_6.patch \ - file://native-nopacklist.patch;patch=1 \ - file://native-perlinc.patch;patch=1" + file://native-nopacklist.patch \ + file://native-perlinc.patch" SRC_URI[md5sum] = "29975a69dce54e47fcd6331c085c6c99" SRC_URI[sha256sum] = "5678bfd5c2cd59253a26171bf3e681235433b00c730eea8a8046e1b225c11d2f" -- cgit v1.2.3-54-g00ecf