diff options
Diffstat (limited to 'meta/classes/cpan-base.bbclass')
| -rw-r--r-- | meta/classes/cpan-base.bbclass | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/meta/classes/cpan-base.bbclass b/meta/classes/cpan-base.bbclass index 6cd2aa340f..b5dbdaea81 100644 --- a/meta/classes/cpan-base.bbclass +++ b/meta/classes/cpan-base.bbclass @@ -7,10 +7,12 @@ FILES_${PN} += "${libdir}/perl ${datadir}/perl" DEPENDS += "${@["perl", "perl-native"][(bb.data.inherits_class('native', d))]}" RDEPENDS += "${@["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 def get_perl_version(d): import re - cfg = bb.data.expand('${STAGING_LIBDIR}/perl/config.sh', d) + cfg = bb.data.expand('${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/config.sh', d) try: f = open(cfg, 'r') except IOError: @@ -27,8 +29,10 @@ def get_perl_version(d): # Determine where the library directories are def perl_get_libdirs(d): libdir = bb.data.getVar('libdir', d, 1) - libdirs = libdir + '/perl' - return libdirs + if is_target(d) == "no": + libdir += '/perl-native' + libdir += '/perl' + return libdir def is_target(d): if not bb.data.inherits_class('native', d): |