1 files changed, 18 insertions, 3 deletions

diff --git a/meta/classes/cpan.bbclass b/meta/classes/cpan.bbclass
index 78b902f85d..74bbebf882 100644
--- a/meta/classes/cpan.bbclass
+++ b/meta/classes/cpan.bbclass
@@ -1,17 +1,32 @@
+#
+# This is for perl modules that use the old Makefile.PL build system
+#
 FILES_${PN} += '${libdir}/perl5'
 EXTRA_CPANFLAGS = ""
 
+DEPENDS  += "perl-native"
+RDEPENDS += "perl"
+
 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:; s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5:" < 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
 }
 
 cpan_do_compile () {
-        oe_runmake PASTHRU_INC="${CFLAGS}"
+        # 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 PASTHRU_INC="${CFLAGS}" CCFLAGS="${CFLAGS}" $OPTIONS
 }
 
 cpan_do_install () {