[oe-commits] Frans Meulenbroeks : cpan.bbclass: removed legacy staging

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 8d209c6d13f52d872031b5ac41f2fb4ec2cd4170
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=8d209c6d13f52d872031b5ac41f2fb4ec2cd4170

Author: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Date:   Sun Jul 25 18:25:49 2010 +0200

cpan.bbclass: removed legacy staging

bumped PR for the main perl recipes so this change takes effect

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Acked-by: Koen Kooi <koen at openembedded.org>
Acked-by: Roman I Khimov <khimov at altell.ru>

---

 classes/cpan.bbclass        |   15 ++++-----------
 recipes/perl/perl_5.10.1.bb |    2 +-
 recipes/perl/perl_5.8.8.bb  |    2 +-
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass
index dfc0926..24e0c6e 100644
--- a/classes/cpan.bbclass
+++ b/classes/cpan.bbclass
@@ -13,6 +13,8 @@ export PERL_INC = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}/CORE"
 export PERL_LIB = "${STAGING_DATADIR}/perl/${@get_perl_version(d)}"
 export PERL_ARCHLIB = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}"
 
+NATIVE_INSTALL_WORKS = "1"
+
 cpan_do_configure () {
 	yes '' | perl Makefile.PL ${EXTRA_CPANFLAGS}
 	if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
@@ -31,16 +33,7 @@ cpan_do_compile () {
 }
 
 cpan_do_install () {
-	if [ ${@is_target(d)} = "yes" ]; then
-		oe_runmake install_vendor
-	fi
-}
-
-cpan_do_stage () {
-	if [ ${@is_target(d)} = "no" ]; then
-		oe_runmake install_vendor
-	fi
+	oe_runmake DESTDIR="${D}" install_vendor
 }
-								
 
-EXPORT_FUNCTIONS do_configure do_compile do_install do_stage
+EXPORT_FUNCTIONS do_configure do_compile do_install
diff --git a/recipes/perl/perl_5.10.1.bb b/recipes/perl/perl_5.10.1.bb
index 86b08dc..e7c90d8 100644
--- a/recipes/perl/perl_5.10.1.bb
+++ b/recipes/perl/perl_5.10.1.bb
@@ -5,7 +5,7 @@ LICENSE = "Artistic|GPL"
 PRIORITY = "optional"
 # We need gnugrep (for -I)
 DEPENDS = "virtual/db perl-native grep-native"
-PR = "r7"
+PR = "r8"
 
 # Not tested enough
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/perl/perl_5.8.8.bb b/recipes/perl/perl_5.8.8.bb
index c73fe4e..29ae66c 100644
--- a/recipes/perl/perl_5.8.8.bb
+++ b/recipes/perl/perl_5.8.8.bb
@@ -5,7 +5,7 @@ LICENSE = "Artistic|GPL"
 PRIORITY = "optional"
 # We need gnugrep (for -I)
 DEPENDS = "virtual/db perl-native grep-native"
-PR = "r34"
+PR = "r35"
 
 # Major part of version
 PVM = "5.8"