diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-11-14 12:09:59 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-11-14 12:09:59 +0100 |
| commit | b32e9132c3b7186605a8f58978bf74dbcf12e1f7 (patch) | |
| tree | 1a77746733e610166d0c0e30f6e1e65ecb74dac9 /classes/cpan-base.bbclass | |
| parent | e51de62ba9a8ee53f6df29ab682598348496ee66 (diff) | |
| parent | 2c09164fd4c11832865f18b72f46266b7abffbc7 (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'classes/cpan-base.bbclass')
| -rw-r--r-- | classes/cpan-base.bbclass | 6 |
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" |