[oe-commits] Koen Kooi : perl: complete config.sh fix
git version control
git at git.openembedded.org
Tue Nov 10 21:17:16 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 09ebc69351c7e28b57ded8c95ee0d27b065e36a1
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=09ebc69351c7e28b57ded8c95ee0d27b065e36a1
Author: Koen Kooi <koen at openembedded.org>
Date: Tue Nov 10 22:16:43 2009 +0100
perl: complete config.sh fix
---
classes/cpan-base.bbclass | 2 +-
recipes/perl/perl-native_5.8.8.bb | 2 +-
recipes/perl/perl.inc | 4 ++--
recipes/perl/perl_5.8.8.bb | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/classes/cpan-base.bbclass b/classes/cpan-base.bbclass
index 394539d..cc0d11e 100644
--- a/classes/cpan-base.bbclass
+++ b/classes/cpan-base.bbclass
@@ -10,7 +10,7 @@ RDEPENDS += "${@["perl", ""][(bb.data.inherits_class('native', d))]}"
# Determine the staged version of perl from the perl configuration file
def get_perl_version(d):
import os, bb, re
- cfg = bb.data.expand('${STAGING_DIR)/${HOST_SYS}/perl/config.sh', d)
+ cfg = bb.data.expand('${STAGING_DIR}/${HOST_SYS}/perl/config.sh', d)
try:
f = open(cfg, 'r')
except IOError:
diff --git a/recipes/perl/perl-native_5.8.8.bb b/recipes/perl/perl-native_5.8.8.bb
index cac474e..ba05406 100644
--- a/recipes/perl/perl-native_5.8.8.bb
+++ b/recipes/perl/perl-native_5.8.8.bb
@@ -88,7 +88,7 @@ do_stage_append() {
}
do_stage_append_nylon() {
# get rid of definitions not supported by the gcc version we use for nylon...
- for i in ${STAGING_LIBDIR_NATIVE}/perl/${PV}/Config_heavy.pl ${STAGING_DIR_HOST}/perl/config.sh; do
+ for i in ${STAGING_LIBDIR_NATIVE}/perl/${PV}/Config_heavy.pl ${STAGING_DIR}/${HOST_SYS}/perl/config.sh; do
perl -pi -e 's/-Wdeclaration-after-statement //g' ${i}
done
}
diff --git a/recipes/perl/perl.inc b/recipes/perl/perl.inc
index 00184a9..9e20ae6 100644
--- a/recipes/perl/perl.inc
+++ b/recipes/perl/perl.inc
@@ -36,8 +36,8 @@ do_install() {
}
do_stage() {
- install -d ${STAGING_DIR_HOST}/perl/
- install config.sh ${STAGING_DIR_HOST}/perl/
+ install -d ${STAGING_DIR}/${HOST_SYS}/perl/
+ install config.sh ${STAGING_DIR}/${HOST_SYS}/perl/
}
PACKAGES_DYNAMIC = "perl-module-*"
diff --git a/recipes/perl/perl_5.8.8.bb b/recipes/perl/perl_5.8.8.bb
index 2508719..35fcc83 100644
--- a/recipes/perl/perl_5.8.8.bb
+++ b/recipes/perl/perl_5.8.8.bb
@@ -141,12 +141,12 @@ do_install() {
fi
}
do_stage() {
- install -d ${STAGING_DIR_HOST}/perl \
+ install -d ${STAGING_DIR}/${HOST_SYS}/perl \
${STAGING_LIBDIR_NATIVE}/perl/${PV} \
${STAGING_LIBDIR}/perl/${PV}/CORE \
${STAGING_DATADIR}/perl/${PV}/ExtUtils
# target config, used by cpan.bbclass to extract version information
- install config.sh ${STAGING_DIR_HOST}/perl/
+ install config.sh ${STAGING_DIR}/${HOST_SYS}/perl/
# target configuration, used by native perl when cross-compiling
install lib/Config_heavy.pl ${STAGING_LIBDIR_NATIVE}/perl/${PV}/Config_heavy-target.pl
# target configuration
More information about the Openembedded-commits
mailing list