From: Jamie Lenehan <lenehan@twibble.org>
Date: Tue, 3 Oct 2006 22:44:31 +0000 (+0000)
Subject: cpan.bbclass: If a module attempts to use LDDFLAGS to link then it will be
X-Git-Tag: Release-2010-05/1~9453^2~626
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9705b34ded8f83e9ef5d79dca33c764052e2ef0;p=openembedded.git

cpan.bbclass: If a module attempts to use LDDFLAGS to link then it will be
linking against the host libraries. Modify LDDFLAGS as part of the other
modifications that already occur.
---

diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass
index f883867a80..74bbebf882 100644
--- a/classes/cpan.bbclass
+++ b/classes/cpan.bbclass
@@ -11,8 +11,12 @@ cpan_do_configure () {
 	perl Makefile.PL ${EXTRA_CPANFLAGS}
 	if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
 		. ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh
-		sed -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:; s:\(SITEARCHEXP = \).*:\1${sitearchexp}:; s:\(INSTALLVENDORLIB = \).*:\1${D}${libdir}/perl5/site_perl/${version}:; s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5/site_perl/${version}:" < Makefile > Makefile.new
-		mv Makefile.new Makefile
+                sed -i -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:" \
+                       -e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \
+                       -e "s:\(INSTALLVENDORLIB = \).*:\1${D}${libdir}/perl5/site_perl/${version}:" \
+                       -e "s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5/site_perl/${version}:" \
+                       -e "s:\(LDDLFLAGS.*\)${STAGING_DIR}/${BUILD_SYS}/lib:\1${STAGING_LIBDIR}:" \
+                       Makefile
 	fi
 }