diff options
Diffstat (limited to 'meta/classes/cpan-base.bbclass')
| -rw-r--r-- | meta/classes/cpan-base.bbclass | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/meta/classes/cpan-base.bbclass b/meta/classes/cpan-base.bbclass index 6cd2aa340f..55ac052695 100644 --- a/meta/classes/cpan-base.bbclass +++ b/meta/classes/cpan-base.bbclass @@ -5,38 +5,36 @@ FILES_${PN} += "${libdir}/perl ${datadir}/perl" DEPENDS += "${@["perl", "perl-native"][(bb.data.inherits_class('native', d))]}" -RDEPENDS += "${@["perl", ""][(bb.data.inherits_class('native', d))]}" +RDEPENDS_${PN} += "${@["perl", ""][(bb.data.inherits_class('native', d))]}" + +PERL_OWN_DIR = "${@["", "/perl-native"][(bb.data.inherits_class('native', d))]}" # Determine the staged version of perl from the perl configuration file +# Assign vardepvalue, because otherwise signature is changed before and after +# perl is built (from None to real version in config.sh). +get_perl_version[vardepvalue] = "${PERL_OWN_DIR}" def get_perl_version(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*)'") - for s in l: - m = r.match(s) - if m: - return m.group(1) - return None - -# Determine where the library directories are -def perl_get_libdirs(d): - libdir = bb.data.getVar('libdir', d, 1) - libdirs = libdir + '/perl' - return libdirs + import re + cfg = d.expand('${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/config.sh') + try: + f = open(cfg, 'r') + except IOError: + return None + l = f.readlines(); + f.close(); + r = re.compile("^version='(\d*\.\d*\.\d*)'") + for s in l: + m = r.match(s) + if m: + return m.group(1) + return None def is_target(d): if not bb.data.inherits_class('native', d): return "yes" return "no" -PERLLIBDIRS = "${@perl_get_libdirs(d)}" - -FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/*/.debug \ - ${PERLLIBDIRS}/auto/*/*/.debug \ - ${PERLLIBDIRS}/auto/*/*/*/.debug" +PERLLIBDIRS = "${libdir}/perl" +PERLLIBDIRS_class-native = "${libdir}/perl-native" +PERLVERSION := "${@get_perl_version(d)}" +PERLVERSION[vardepvalue] = "" |