From: Jamie Lenehan <lenehan@twibble.org>
Date: Fri, 4 May 2007 01:34:31 +0000 (+0000)
Subject: perl/perl-native 5.8.8: Move the creation of the hostperl link in staging
X-Git-Tag: Release-2010-05/1~8868^2~642
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=325245976e2b28f7104994fdedeba95d1fc838ce;p=openembedded.git

perl/perl-native 5.8.8: Move the creation of the hostperl link in staging
from the configure task in perl to the stage task in perl-native where it
belongs - perl shouldn't be messing with the staged perl-native.
---

diff --git a/packages/perl/perl-native_5.8.8.bb b/packages/perl/perl-native_5.8.8.bb
index a9333d79ee..7a3570906f 100644
--- a/packages/perl/perl-native_5.8.8.bb
+++ b/packages/perl/perl-native_5.8.8.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.perl.org/"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
 DEPENDS = "virtual/db-native gdbm-native"
-PR = "r2"
+PR = "r3"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/perl-${PV}"
 
@@ -47,5 +47,9 @@ do_configure () {
          s!${STAGING_DIR}/lib!${STAGING_LIBDIR}!' < config.sh > config.sh.new
     mv config.sh.new config.sh
 }
+do_stage_append() {
+        # We need a hostperl link for building perl
+        ln -sf ${STAGING_BINDIR_NATIVE}/perl${PV} ${STAGING_BINDIR_NATIVE}/hostperl
+}
 
 PARALLEL_MAKE = ""
diff --git a/packages/perl/perl_5.8.8.bb b/packages/perl/perl_5.8.8.bb
index 1f7751851d..84763b342e 100644
--- a/packages/perl/perl_5.8.8.bb
+++ b/packages/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 = "r10"
+PR = "r11"
 
 # Major part of version
 PVM = "5.8"
@@ -42,9 +42,6 @@ HOSTPERL = "${STAGING_BINDIR_NATIVE}/perl${PV}"
 export PERLHOSTLIB = "${STAGING_DIR}/${BUILD_SYS}/lib/perl5/${PV}/${BUILD_ARCH}-${BUILD_OS}-thread-multi/"
 
 do_configure() {
-        # Put a hostperl in staging - should probably be part of do_deploy for native
-        ln -sf ${HOSTPERL} ${STAGING_BINDIR_NATIVE}/hostperl
-
         # Make hostperl in build directory be the native perl
         cp -f ${HOSTPERL} hostperl