mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-13 04:03:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

perl-native_5.12.2.bb: Fix compliation on ubuntu 11.04-alpha

Browse Source 
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)

(From OE-Core rev: 9260c1b9d04a88d15ab5376c7cd56f381fe3e53b)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Further tweaks to Configure-multilib.patch for x86_64 vs x86
from Gary Thomas

Cc: gary@mlbassoc.com
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2011-03-17 22:40:15 -07:00
committed by Richard Purdie
parent 77556142cd
commit 7050587909
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
meta/recipes-devtools/perl/files/Configure-multilib.patch Normal file
View File

@@ -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"

10
meta/recipes-devtools/perl/perl-native_5.12.3.bb
View File

@@ -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"