From ca5f36ee6ad756e1e540288a56a504c1d8ecc7a3 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Wed, 18 Nov 2009 20:05:55 +0000
Subject: perl: Update from OE.dev and convert to use do_install for staging

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 meta/classes/cpan_build.bbclass | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

(limited to 'meta/classes/cpan_build.bbclass')

diff --git a/meta/classes/cpan_build.bbclass b/meta/classes/cpan_build.bbclass
index 6cac85c5fe..944e8d4ac0 100644
--- a/meta/classes/cpan_build.bbclass
+++ b/meta/classes/cpan_build.bbclass
@@ -23,7 +23,7 @@ cpan_build_do_configure () {
 	if [ ${@is_target(d)} == "yes" ]; then
 		# build for target
 		. ${STAGING_LIBDIR}/perl/config.sh
-		if [ "${IS_NEW_PERL}" = "yes" ]; then
+
 			perl Build.PL --installdirs vendor \
 				--destdir ${D} \
 				--install_path lib="${datadir}/perl5" \
@@ -32,19 +32,9 @@ cpan_build_do_configure () {
 				--install_path bin=${bindir} \
 				--install_path bindoc=${mandir}/man1 \
 				--install_path libdoc=${mandir}/man3
-		else
-			perl Build.PL --installdirs vendor \
-				--destdir ${D} \
-				--install_path lib="${libdir}/perl5/site_perl/${version}" \
-				--install_path arch="${libdir}/perl5/site_perl/${version}/${TARGET_SYS}" \
-				--install_path script=${bindir} \
-				--install_path bin=${bindir} \
-				--install_path bindoc=${mandir}/man1 \
-				--install_path libdoc=${mandir}/man3
-		fi
 	else
 		# build for host
-		perl Build.PL --installdirs site
+		perl Build.PL --installdirs site --destdir ${D}
 	fi
 }
 
@@ -52,16 +42,9 @@ cpan_build_do_compile () {
         perl Build
 }
 
+NATIVE_INSTALL_WORKS = "1"
 cpan_build_do_install () {
-	if [ ${@is_target(d)} == "yes" ]; then
-		perl Build install
-	fi
-}
-
-do_stage () {
-	if [ ${@is_target(d)} == "no" ]; then
-		perl Build install
-	fi
+	perl Build install
 }
 
 EXPORT_FUNCTIONS do_configure do_compile do_install
-- 
cgit 1.2.3-korg