diff options
Diffstat (limited to 'classes/cpan-base.bbclass')
| -rw-r--r-- | classes/cpan-base.bbclass | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/classes/cpan-base.bbclass b/classes/cpan-base.bbclass index 19d431ce72..379defadb2 100644 --- a/classes/cpan-base.bbclass +++ b/classes/cpan-base.bbclass @@ -9,45 +9,32 @@ 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}/perl/config.sh', d) + import re + cfg = bb.data.expand('${STAGING_LIBDIR}/perl/config.sh', d) try: f = open(cfg, 'r') except IOError: return None l = f.readlines(); f.close(); - r = re.compile("version='(\d\.\d\.\d)'") + r = re.compile("version='(\d+\.\d+\.\d+)'") for s in l: m = r.match(s) if m: return m.group(1) return None -# Only 5.8.7 and 5.8.4 existed at the time we moved to the new layout -def is_new_perl(d): - ver = get_perl_version(d) - if ver == "5.8.4" or ver == "5.8.7": - return "no" - return "yes" - # 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' - else: - libdirs = libdir + '/*/*/perl5' + libdirs = libdir + '/perl5' return libdirs def is_target(d): - import bb if not bb.data.inherits_class('native', d): return "yes" return "no" -IS_NEW_PERL = "${@is_new_perl(d)}" PERLLIBDIRS = "${@perl_get_libdirs(d)}" FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/*/.debug \ |