From 753137f9a89402c6c56bae5bad21d7c78f261bec Mon Sep 17 00:00:00 2001
From: Roman I Khimov <khimov@altell.ru>
Date: Fri, 19 Mar 2010 00:13:05 +0300
Subject: perl: remove versions 5.8.4 and 5.8.7

Obsolete, not used.

Signed-off-by: Roman I Khimov <khimov@altell.ru>
Acked-by: Graeme Gregory <dp@xora.org.uk>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
---
 classes/cpan.bbclass | 35 +++++++----------------------------
 1 file changed, 7 insertions(+), 28 deletions(-)

(limited to 'classes/cpan.bbclass')

diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass
index 66054bc755..dfc092601e 100644
--- a/classes/cpan.bbclass
+++ b/classes/cpan.bbclass
@@ -17,38 +17,17 @@ cpan_do_configure () {
 	yes '' | perl Makefile.PL ${EXTRA_CPANFLAGS}
 	if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
 		. ${STAGING_LIBDIR}/perl/config.sh
-		if [ "${IS_NEW_PERL}" = "yes" ]; then
-			sed -i -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:" \
-				-e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \
-				-e "s:\(INSTALLVENDORLIB = \).*:\1${D}${datadir}/perl5:" \
-				-e "s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5:" \
-				-e "s:\(LDDLFLAGS.*\)${STAGING_LIBDIR_NATIVE}:\1${STAGING_LIBDIR}:" \
-				Makefile
-		else
-			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_LIBDIR_NATIVE}:\1${STAGING_LIBDIR}:" \
-				Makefile
-		fi
+		sed -i -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:" \
+			-e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \
+			-e "s:\(INSTALLVENDORLIB = \).*:\1${D}${datadir}/perl5:" \
+			-e "s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5:" \
+			-e "s:\(LDDLFLAGS.*\)${STAGING_LIBDIR_NATIVE}:\1${STAGING_LIBDIR}:" \
+			Makefile
 	fi
 }
 
 cpan_do_compile () {
-	if [ "${IS_NEW_PERL}" = "yes" ]; then
-		oe_runmake PASTHRU_INC="${CFLAGS}" CCFLAGS="${CFLAGS}" LD="${CCLD}"
-	else
-		# 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
-		if test ${TARGET_ARCH} = "powerpc" ; then
-			OPTIONS="LD=${TARGET_ARCH}-${TARGET_OS}-gcc"
-		fi
-		oe_runmake PASTHRU_INC="${CFLAGS}" CCFLAGS="${CFLAGS}" $OPTIONS
-	fi
+	oe_runmake PASTHRU_INC="${CFLAGS}" CCFLAGS="${CFLAGS}" LD="${CCLD}"
 }
 
 cpan_do_install () {
-- 
cgit v1.2.3