diff options
Diffstat (limited to 'meta/classes/cross-canadian.bbclass')
-rw-r--r-- | meta/classes/cross-canadian.bbclass | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index f5c9f61595..ffbc2167e3 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass @@ -36,10 +36,12 @@ python () { return tos = d.getVar("TARGET_OS") - whitelist = [] + whitelist = ["mingw32"] extralibcs = [""] if "musl" in d.getVar("BASECANADIANEXTRAOS"): extralibcs.append("musl") + if "android" in tos: + extralibcs.append("android") for variant in ["", "spe", "x32", "eabi", "n32", "_ilp32"]: for libc in extralibcs: entry = "linux" @@ -104,7 +106,7 @@ STAGING_DIR_HOST = "${RECIPE_SYSROOT}" TOOLCHAIN_OPTIONS = " --sysroot=${RECIPE_SYSROOT}" -PATH_append = ":${TMPDIR}/sysroots/${HOST_ARCH}/${bindir_cross}" +PATH:append = ":${TMPDIR}/sysroots/${HOST_ARCH}/${bindir_cross}" PKGHIST_DIR = "${TMPDIR}/pkghistory/${HOST_ARCH}-${SDKPKGSUFFIX}${HOST_VENDOR}-${HOST_OS}/" HOST_ARCH = "${SDK_ARCH}" @@ -129,7 +131,7 @@ LDFLAGS = "${BUILDSDK_LDFLAGS} \ # We need chrpath >= 0.14 to ensure we can deal with 32 and 64 bit # binaries # -DEPENDS_append = " chrpath-replacement-native" +DEPENDS:append = " chrpath-replacement-native" EXTRANATIVEPATH += "chrpath-native" # Path mangling needed by the cross packaging @@ -153,9 +155,9 @@ base_sbindir = "${bindir}" libdir = "${exec_prefix}/lib/${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}" libexecdir = "${exec_prefix}/libexec/${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}" -FILES_${PN} = "${prefix}" +FILES:${PN} = "${prefix}" -export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${layout_libdir}/pkgconfig" +export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${exec_prefix}/lib/pkgconfig" export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" do_populate_sysroot[stamp-extra-info] = "" |