diff options
Diffstat (limited to 'meta/classes/nativesdk.bbclass')
| -rw-r--r-- | meta/classes/nativesdk.bbclass | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass index 94365e3c66..30bcdfeb44 100644 --- a/meta/classes/nativesdk.bbclass +++ b/meta/classes/nativesdk.bbclass @@ -1,19 +1,19 @@ -inherit relocatable - # SDK packages are built either explicitly by the user, # or indirectly via dependency. No need to be in 'world'. EXCLUDE_FROM_WORLD = "1" STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${SDK_VENDOR}-${SDK_OS}" -# we dont want libc-uclibc or libc-glibc to kick in for nativesdk recipes -LIBCOVERRIDE = "" +# libc for the SDK can be different to that of the target +NATIVESDKLIBC ?= "libc-glibc" +LIBCOVERRIDE = ":${NATIVESDKLIBC}" CLASSOVERRIDE = "class-nativesdk" +MACHINEOVERRIDES = "" # # Update PACKAGE_ARCH and PACKAGE_ARCHS # -PACKAGE_ARCH = "${SDK_ARCH}-nativesdk" +PACKAGE_ARCH = "${SDK_ARCH}-${SDKPKGSUFFIX}" PACKAGE_ARCHS = "${SDK_PACKAGE_ARCHS}" # @@ -25,6 +25,7 @@ EXTRANATIVEPATH += "chrpath-native" STAGING_DIR_HOST = "${STAGING_DIR}/${MULTIMACH_HOST_SYS}" STAGING_DIR_TARGET = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}" +PKGDATA_DIR = "${STAGING_DIR_HOST}/pkgdata" HOST_ARCH = "${SDK_ARCH}" HOST_VENDOR = "${SDK_VENDOR}" @@ -43,7 +44,7 @@ TARGET_CC_ARCH = "${SDK_CC_ARCH}" TARGET_LD_ARCH = "${SDK_LD_ARCH}" TARGET_AS_ARCH = "${SDK_AS_ARCH}" TARGET_FPU = "" -EXTRA_OECONF_FPU = "" +EXTRA_OECONF_GCC_FLOAT = "" CPPFLAGS = "${BUILDSDK_CPPFLAGS}" CFLAGS = "${BUILDSDK_CFLAGS}" @@ -60,11 +61,8 @@ export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${libdir}/pkgconfig" export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" python nativesdk_virtclass_handler () { - if not isinstance(e, bb.event.RecipePreFinalise): - return - pn = e.data.getVar("PN", True) - if not pn.endswith("-nativesdk") or pn.startswith("nativesdk-"): + if not (pn.endswith("-nativesdk") or pn.startswith("nativesdk-")): return e.data.setVar("MLPREFIX", "nativesdk-") @@ -86,9 +84,13 @@ python () { clsextend.map_depends_variable("DEPENDS") clsextend.map_packagevars() clsextend.map_variable("PROVIDES") + clsextend.map_regexp_variable("PACKAGES_DYNAMIC") } addhandler nativesdk_virtclass_handler +nativesdk_virtclass_handler[eventmask] = "bb.event.RecipePreFinalise" do_populate_sysroot[stamp-extra-info] = "" -do_package[stamp-extra-info] = "" +do_packagedata[stamp-extra-info] = "" + +USE_NLS = "${SDKUSE_NLS}" |