summaryrefslogtreecommitdiff
path: root/classes/cpan-base.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-11 21:01:47 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-11 21:02:36 +0000
commit25db6767cbf1b00a4e8dbf746d2d16458c3696ea (patch)
tree6f3bb096161bfd8567fcf0bb822f6f96b1607016 /classes/cpan-base.bbclass
parent177ca0dc717faafb67d9fa2f6236eccc182b8038 (diff)
perl: Move config.sh to STAGING_LIBDIR rather than trying to be clever with staging variables and losing
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'classes/cpan-base.bbclass')
-rw-r--r--classes/cpan-base.bbclass6
1 files changed, 2 insertions, 4 deletions
diff --git a/classes/cpan-base.bbclass b/classes/cpan-base.bbclass
index cc0d11e515..82fd5b459a 100644
--- a/classes/cpan-base.bbclass
+++ b/classes/cpan-base.bbclass
@@ -9,8 +9,8 @@ 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)
+ import re
+ cfg = bb.data.expand('${STAGING_LIBDIR}/perl/config.sh', d)
try:
f = open(cfg, 'r')
except IOError:
@@ -33,7 +33,6 @@ def is_new_perl(d):
# Determine where the library directories are
def perl_get_libdirs(d):
- import bb
libdir = bb.data.getVar('libdir', d, 1)
if is_new_perl(d) == "yes":
libdirs = libdir + '/perl5'
@@ -42,7 +41,6 @@ def perl_get_libdirs(d):
return libdirs
def is_target(d):
- import bb
if not bb.data.inherits_class('native', d):
return "yes"
return "no"