summaryrefslogtreecommitdiff
path: root/meta/classes/cross-canadian.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/cross-canadian.bbclass')
-rw-r--r--meta/classes/cross-canadian.bbclass127
1 files changed, 95 insertions, 32 deletions
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass
index fec6438c60..49388d4cf2 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/meta/classes/cross-canadian.bbclass
@@ -1,5 +1,5 @@
#
-# NOTE - When using this class the user is repsonsible for ensuring that
+# NOTE - When using this class the user is responsible for ensuring that
# TRANSLATED_TARGET_ARCH is added into PN. This ensures that if the TARGET_ARCH
# is changed, another nativesdk xxx-canadian-cross can be installed
#
@@ -15,41 +15,94 @@ STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${S
# Update BASE_PACKAGE_ARCH and PACKAGE_ARCHS
#
PACKAGE_ARCH = "${SDK_ARCH}-${SDKPKGSUFFIX}"
-CANADIANEXTRAOS = ""
+BASECANADIANEXTRAOS ?= "linux-uclibc linux-musl"
+CANADIANEXTRAOS = "${BASECANADIANEXTRAOS}"
+CANADIANEXTRAVENDOR = ""
+MODIFYTOS ??= "1"
python () {
- archs = d.getVar('PACKAGE_ARCHS', True).split()
+ archs = d.getVar('PACKAGE_ARCHS').split()
sdkarchs = []
for arch in archs:
sdkarchs.append(arch + '-${SDKPKGSUFFIX}')
d.setVar('PACKAGE_ARCHS', " ".join(sdkarchs))
- # PowerPC can build "linux" and "linux-gnuspe"
- tarch = d.getVar("TARGET_ARCH", True)
- if tarch == "powerpc":
- tos = d.getVar("TARGET_OS", True)
- if (tos != "linux" and tos != "linux-gnuspe"
- and tos != "linux-uclibc" and tos != "linux-uclibcspe"
- and tos != "linux-musl" and tos != "linux-muslspe"):
- bb.fatal("Building cross-candian powerpc for an unknown TARGET_SYS (%s), please update cross-canadian.bbclass" % d.getVar("TARGET_SYS", True))
- # This is a bit ugly. We need to zero LIBC/ABI extension which will change TARGET_OS
- # however we need the old value in some variables. We expand those here first.
- d.setVar("DEPENDS", d.getVar("DEPENDS", True))
- d.setVar("STAGING_BINDIR_TOOLCHAIN", d.getVar("STAGING_BINDIR_TOOLCHAIN", True))
- for prefix in ["AR", "AS", "DLLTOOL", "CC", "CXX", "GCC", "LD", "LIPO", "NM", "OBJDUMP", "RANLIB", "STRIP", "WINDRES"]:
- n = prefix + "_FOR_TARGET"
- d.setVar(n, d.getVar(n, True))
-
+ # Allow the following code segment to be disabled, e.g. meta-environment
+ if d.getVar("MODIFYTOS") != "1":
+ return
+
+ if d.getVar("TCLIBC") == "baremetal":
+ return
+
+ tos = d.getVar("TARGET_OS")
+ whitelist = []
+ extralibcs = [""]
+ if "uclibc" in d.getVar("BASECANADIANEXTRAOS"):
+ extralibcs.append("uclibc")
+ if "musl" in d.getVar("BASECANADIANEXTRAOS"):
+ extralibcs.append("musl")
+ for variant in ["", "spe", "x32", "eabi", "n32"]:
+ for libc in extralibcs:
+ entry = "linux"
+ if variant and libc:
+ entry = entry + "-" + libc + variant
+ elif variant:
+ entry = entry + "-gnu" + variant
+ elif libc:
+ entry = entry + "-" + libc
+ whitelist.append(entry)
+ if tos not in whitelist:
+ bb.fatal("Building cross-candian for an unknown TARGET_SYS (%s), please update cross-canadian.bbclass" % d.getVar("TARGET_SYS"))
+
+ for n in ["PROVIDES", "DEPENDS"]:
+ d.setVar(n, d.getVar(n))
+ d.setVar("STAGING_BINDIR_TOOLCHAIN", d.getVar("STAGING_BINDIR_TOOLCHAIN"))
+ for prefix in ["AR", "AS", "DLLTOOL", "CC", "CXX", "GCC", "LD", "LIPO", "NM", "OBJDUMP", "RANLIB", "STRIP", "WINDRES"]:
+ n = prefix + "_FOR_TARGET"
+ d.setVar(n, d.getVar(n))
+ # This is a bit ugly. We need to zero LIBC/ABI extension which will change TARGET_OS
+ # however we need the old value in some variables. We expand those here first.
+ tarch = d.getVar("TARGET_ARCH")
+ if tarch == "x86_64":
+ d.setVar("LIBCEXTENSION", "")
+ d.setVar("ABIEXTENSION", "")
+ d.appendVar("CANADIANEXTRAOS", " linux-gnux32")
+ for extraos in d.getVar("BASECANADIANEXTRAOS").split():
+ d.appendVar("CANADIANEXTRAOS", " " + extraos + "x32")
+ elif tarch == "powerpc":
+ # PowerPC can build "linux" and "linux-gnuspe"
d.setVar("LIBCEXTENSION", "")
d.setVar("ABIEXTENSION", "")
- d.setVar("CANADIANEXTRAOS", "linux-gnuspe")
+ d.appendVar("CANADIANEXTRAOS", " linux-gnuspe")
+ for extraos in d.getVar("BASECANADIANEXTRAOS").split():
+ d.appendVar("CANADIANEXTRAOS", " " + extraos + "spe")
+ elif tarch == "mips64":
+ d.appendVar("CANADIANEXTRAOS", " linux-gnun32")
+ for extraos in d.getVar("BASECANADIANEXTRAOS").split():
+ d.appendVar("CANADIANEXTRAOS", " " + extraos + "n32")
+ if tarch == "arm" or tarch == "armeb":
+ d.appendVar("CANADIANEXTRAOS", " linux-gnueabi linux-musleabi linux-uclibceabi")
+ d.setVar("TARGET_OS", "linux-gnueabi")
+ else:
+ d.setVar("TARGET_OS", "linux")
+
+ # Also need to handle multilib target vendors
+ vendors = d.getVar("CANADIANEXTRAVENDOR")
+ if not vendors:
+ vendors = all_multilib_tune_values(d, 'TARGET_VENDOR')
+ origvendor = d.getVar("TARGET_VENDOR_MULTILIB_ORIGINAL")
+ if origvendor:
+ d.setVar("TARGET_VENDOR", origvendor)
+ if origvendor not in vendors.split():
+ vendors = origvendor + " " + vendors
+ d.setVar("CANADIANEXTRAVENDOR", vendors)
}
MULTIMACH_TARGET_SYS = "${PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}"
INHIBIT_DEFAULT_DEPS = "1"
-STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_ARCH}-${SDKPKGSUFFIX}${HOST_VENDOR}-${HOST_OS}"
+STAGING_DIR_HOST = "${RECIPE_SYSROOT}"
-TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR}/${HOST_ARCH}-${SDKPKGSUFFIX}${HOST_VENDOR}-${HOST_OS}"
+TOOLCHAIN_OPTIONS = " --sysroot=${RECIPE_SYSROOT}"
PATH_append = ":${TMPDIR}/sysroots/${HOST_ARCH}/${bindir_cross}"
PKGHIST_DIR = "${TMPDIR}/pkghistory/${HOST_ARCH}-${SDKPKGSUFFIX}${HOST_VENDOR}-${HOST_OS}/"
@@ -62,8 +115,13 @@ HOST_CC_ARCH = "${SDK_CC_ARCH}"
HOST_LD_ARCH = "${SDK_LD_ARCH}"
HOST_AS_ARCH = "${SDK_AS_ARCH}"
+TARGET_CPPFLAGS = "${BUILDSDK_CPPFLAGS}"
+TARGET_CFLAGS = "${BUILDSDK_CFLAGS}"
+TARGET_CXXFLAGS = "${BUILDSDK_CXXFLAGS}"
+TARGET_LDFLAGS = "${BUILDSDK_LDFLAGS}"
+
#assign DPKG_ARCH
-DPKG_ARCH = "${SDK_ARCH}"
+DPKG_ARCH = "${@debian_arch_map(d.getVar('SDK_ARCH'), '')}"
CPPFLAGS = "${BUILDSDK_CPPFLAGS}"
CFLAGS = "${BUILDSDK_CFLAGS}"
@@ -103,9 +161,6 @@ 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}-dbg += "${prefix}/.debug \
- ${prefix}/bin/.debug \
- "
export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${layout_libdir}/pkgconfig"
export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}"
@@ -119,20 +174,28 @@ USE_NLS = "${SDKUSE_NLS}"
# and not any particular tune that is enabled.
TARGET_ARCH[vardepsexclude] = "TUNE_ARCH"
+PKGDATA_DIR = "${TMPDIR}/pkgdata/${SDK_SYS}"
# If MLPREFIX is set by multilib code, shlibs
# points to the wrong place so force it
SHLIBSDIRS = "${PKGDATA_DIR}/nativesdk-shlibs2"
SHLIBSWORKDIR = "${PKGDATA_DIR}/nativesdk-shlibs2"
cross_canadian_bindirlinks () {
- for i in ${CANADIANEXTRAOS}
+ for i in linux ${CANADIANEXTRAOS}
do
- d=${D}${bindir}/../${TARGET_ARCH}${TARGET_VENDOR}-$i
- install -d $d
- for j in `ls ${D}${bindir}`
+ for v in ${CANADIANEXTRAVENDOR}
do
- p=${TARGET_ARCH}${TARGET_VENDOR}-$i-`echo $j | sed -e s,${TARGET_PREFIX},,`
- ln -s ../${TARGET_SYS}/$j $d/$p
+ d=${D}${bindir}/../${TARGET_ARCH}$v-$i
+ if [ -d $d ];
+ then
+ continue
+ fi
+ install -d $d
+ for j in `ls ${D}${bindir}`
+ do
+ p=${TARGET_ARCH}$v-$i-`echo $j | sed -e s,${TARGET_PREFIX},,`
+ ln -s ../${TARGET_SYS}/$j $d/$p
+ done
done
done
}