perl: Standardise config.sh location

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

3 files changed, 5 insertions, 3 deletions

diff --git a/meta/classes/cpan-base.bbclass b/meta/classes/cpan-base.bbclass
index 919a9b06a5..82fd5b459a 100644
--- a/meta/classes/cpan-base.bbclass
+++ b/meta/classes/cpan-base.bbclass
@@ -10,7 +10,7 @@ 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 re
-        cfg = bb.data.expand('${STAGING_DIR}/${HOST_SYS}/perl/config.sh', d)
+        cfg = bb.data.expand('${STAGING_LIBDIR}/perl/config.sh', d)
         try:
                 f = open(cfg, 'r')
         except IOError:
diff --git a/meta/classes/cpan.bbclass b/meta/classes/cpan.bbclass
index ca5303d97f..66054bc755 100644
--- a/meta/classes/cpan.bbclass
+++ b/meta/classes/cpan.bbclass
@@ -10,11 +10,13 @@ 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_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}
         if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
-                . ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh
+                . ${STAGING_LIBDIR}/perl/config.sh
                 if [ "${IS_NEW_PERL}" = "yes" ]; then
                         sed -i -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:" \
                                 -e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \
diff --git a/meta/classes/cpan_build.bbclass b/meta/classes/cpan_build.bbclass
index 9cfe72bcb7..6cac85c5fe 100644
--- a/meta/classes/cpan_build.bbclass
+++ b/meta/classes/cpan_build.bbclass
@@ -22,7 +22,7 @@ DEPENDS_prepend = "${@cpan_build_dep_prepend(d)}"
 cpan_build_do_configure () {
         if [ ${@is_target(d)} == "yes" ]; then
                 # build for target
-                . ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh
+                . ${STAGING_LIBDIR}/perl/config.sh
                 if [ "${IS_NEW_PERL}" = "yes" ]; then
                         perl Build.PL --installdirs vendor \
                                 --destdir ${D} \