From: Roman I Khimov <khimov@altell.ru>
Date: Thu, 18 Mar 2010 15:29:38 +0000 (+0300)
Subject: cpan_build: adapt to new staging for native
X-Git-Tag: Release-2010-05/1~302^2~41
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=243f90253fdf8c69821d5328c1073a69277a1194;p=openembedded.git

cpan_build: adapt to new staging for native

Signed-off-by: Roman I Khimov <khimov@altell.ru>
---

diff --git a/classes/cpan_build.bbclass b/classes/cpan_build.bbclass
index 899c4010ac..56f58168c7 100644
--- a/classes/cpan_build.bbclass
+++ b/classes/cpan_build.bbclass
@@ -3,7 +3,7 @@
 #
 inherit cpan-base
 
-INHIBIT_NATIVE_STAGE_INSTALL = "1"
+NATIVE_INSTALL_WORKS = "1"
 
 #
 # We also need to have built libmodule-build-perl-native for
@@ -46,12 +46,8 @@ cpan_build_do_compile () {
 cpan_build_do_install () {
 	if [ ${@is_target(d)} == "yes" ]; then
 		perl Build install
-	fi
-}
-
-do_stage_append () {
-	if [ ${@is_target(d)} == "no" ]; then
-		perl Build install
+	else
+		perl Build install destdir="${WORKDIR}/image"
 	fi
 }