summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
Diffstat (limited to 'classes')
-rw-r--r--classes/cpan.bbclass3
-rw-r--r--classes/src_distribute.bbclass4
2 files changed, 5 insertions, 2 deletions
diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass
index 3ff3f3093d..7b3faa2561 100644
--- a/classes/cpan.bbclass
+++ b/classes/cpan.bbclass
@@ -10,7 +10,8 @@ export PERLCONFIGTARGET = "${@is_target(d)}"
# Env var which tells perl where the perl include files are
export PERL_INC = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}/CORE"
-export PERL_ARCHLIB = "${STAGING_LIBDIR_NATIVE}/perl/${@get_perl_version(d)}"
+export PERL_LIB = "${STAGING_DATADIR}/perl/${@get_perl_version(d)}"
+export PERL_ARCHLIB = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}"
cpan_do_configure () {
yes '' | perl Makefile.PL ${EXTRA_CPANFLAGS}
diff --git a/classes/src_distribute.bbclass b/classes/src_distribute.bbclass
index f20410d0bb..a12473950a 100644
--- a/classes/src_distribute.bbclass
+++ b/classes/src_distribute.bbclass
@@ -8,7 +8,9 @@ python do_distribute_sources () {
import re
for license in licenses:
for entry in license.split("|"):
- for s in (bb.data.getVar('A', d, 1) or "").split():
+ for url in ((bb.data.getVar('SRC_URI', d, 1) or '').split()):
+ bb.fetch.init([url], d)
+ s = bb.fetch.localpath(url, d)
s = re.sub(';.*$', '', s)
cmd = bb.data.getVar('SRC_DISTRIBUTECOMMAND', d, 1)
if not cmd: