From: Jamie Lenehan <lenehan@twibble.org>
Date: Fri, 29 Sep 2006 08:59:03 +0000 (+0000)
Subject: perl: More shared library fixes for sh3/sh4, this time for the shared
X-Git-Tag: Release-2010-05/1~9453^2~669^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0e5f6e2d7e39e5dab9e76cc200804b1948670d3;p=openembedded.git

perl: More shared library fixes for sh3/sh4, this time for the shared
libraries used by standard perl modules. This was picking up LD from OE
which as the linking when we need to use gcc to link. Override LD when
calling oe_make to force the use of gcc to link.
---

diff --git a/packages/perl/perl.inc b/packages/perl/perl.inc
index ad0562d3a4..4cddcdb18a 100644
--- a/packages/perl/perl.inc
+++ b/packages/perl/perl.inc
@@ -41,7 +41,12 @@ do_configure() {
 do_compile() {
 	sed -i -e 's|/usr/include|${STAGING_INCDIR}|g' ext/Errno/Errno_pm.PL
 	cd Cross
-	oe_runmake perl
+	# You must use gcc to link on sh
+	OPTIONS=""
+	if test ${TARGET_ARCH} = "sh3" -o ${TARGET_ARCH} = "sh4"; then
+		OPTIONS="LD=${TARGET_ARCH}-${TARGET_OS}-gcc"
+	fi
+	oe_runmake perl $OPTIONS
 }
 
 do_install() {
diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb
index 834be8fcc9..2bc2e16a32 100644
--- a/packages/perl/perl_5.8.7.bb
+++ b/packages/perl/perl_5.8.7.bb
@@ -19,7 +19,7 @@ SRC_URI_append_sh3 += "file://makefile-usegcc-to-link.patch;patch=1"
 
 PARALLEL_MAKE = ""
 
-PR = "r18"
+PR = "r19"
 
 do_configure() {
 	ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl