cpan* bbclass: fix for staging layout changes

sdk bblcass: ditto, this time the fix is from poky

diff --git a/classes/cpan-base.bbclass b/classes/cpan-base.bbclass
index cc0d11e..19d431c 100644 (file)
--- a/classes/cpan-base.bbclass
+++ b/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 os, bb, re
-       cfg = bb.data.expand('${STAGING_DIR}/${HOST_SYS}/perl/config.sh', d)
+       cfg = bb.data.expand('${STAGING_DIR_HOST}/perl/config.sh', d)
        try:
                f = open(cfg, 'r')
        except IOError:

diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass
index 005e7cc..3ff3f30 100644 (file)
--- a/classes/cpan.bbclass
+++ b/classes/cpan.bbclass
@@ -15,7 +15,7 @@ export PERL_ARCHLIB = "${STAGING_LIBDIR_NATIVE}/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_DIR_TARGET}/perl/config.sh
                if [ "${IS_NEW_PERL}" = "yes" ]; then
                        sed -i -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:" \
                                -e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \

diff --git a/classes/cpan_build.bbclass b/classes/cpan_build.bbclass
index 63e716c..c3804ff 100644 (file)
--- a/classes/cpan_build.bbclass
+++ b/classes/cpan_build.bbclass
@@ -25,7 +25,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_DIR_TARGET}/perl/config.sh
                if [ "${IS_NEW_PERL}" = "yes" ]; then
                        perl Build.PL --installdirs vendor \
                                --destdir ${D} \

diff --git a/classes/sdk.bbclass b/classes/sdk.bbclass
index a94332b..6c66eac 100644 (file)
--- a/classes/sdk.bbclass
+++ b/classes/sdk.bbclass
@@ -2,15 +2,24 @@
 # or indirectly via dependency.  No need to be in 'world'.
 EXCLUDE_FROM_WORLD = "1"
 
+# Save MULTIMACH_ARCH
+OLD_MULTIMACH_ARCH := "${MULTIMACH_ARCH}"
+# Save PACKAGE_ARCH
 OLD_PACKAGE_ARCH := ${PACKAGE_ARCH}
 PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk"
+# Also save BASE_PACKAGE_ARCH since HOST_ARCH can influence it
+OLD_BASE_PACKAGE_ARCH := "${BASE_PACKAGE_ARCH}"
+BASE_PACKAGE_ARCH = "${OLD_BASE_PACKAGE_ARCH}"
+
 STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}-sdk"
+STAGING_DIR_TARGET = "${STAGING_DIR}/${OLD_MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
 
 HOST_ARCH = "${BUILD_ARCH}"
 HOST_VENDOR = "${BUILD_VENDOR}"
 HOST_OS = "${BUILD_OS}"
 HOST_PREFIX = "${BUILD_PREFIX}"
 HOST_CC_ARCH = "${BUILD_CC_ARCH}"
+#HOST_SYS = "${HOST_ARCH}${TARGET_VENDOR}-${HOST_OS}"
 
 CPPFLAGS = "${BUILD_CPPFLAGS}"
 CFLAGS = "${BUILD_CFLAGS}"