aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes/cross-canadian.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-25 14:47:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-27 23:28:22 +0100
commitee16cb0a3f40384f509083f0ef3f36b68f73b7cf (patch)
tree238dcd8a8607c5c4ec08b22bde8656fb2c9ace0b /meta/classes/cross-canadian.bbclass
parentda2e92e256054b137a1646fdad1fe1a47ba3215a (diff)
downloadopenembedded-core-contrib-ee16cb0a3f40384f509083f0ef3f36b68f73b7cf.tar.gz
cross-canadian: Put links in place for uclibc and musl
gcc-cross-canadian-<arch> is only built once. It needs to target all the different libcs, not just the currently selected one. This change ensures that if another libc is used, symlinks are present such that the compiler can be found. The base version is always assumed to be "glibc" with symlinks from musl and uclibc compiler names. This means gcc-cross-canadian is consistent regardless of which libc is selected when its build in multimachine builds. [YOCTO #8025] (From OE-Core rev: 83ead626c0da75edec2833ffb1a29011ec7b83d2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/cross-canadian.bbclass')
-rw-r--r--meta/classes/cross-canadian.bbclass53
1 files changed, 36 insertions, 17 deletions
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass
index a8565e91e3e..a4ce5c7b98e 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/meta/classes/cross-canadian.bbclass
@@ -15,7 +15,7 @@ STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${S
# Update BASE_PACKAGE_ARCH and PACKAGE_ARCHS
#
PACKAGE_ARCH = "${SDK_ARCH}-${SDKPKGSUFFIX}"
-CANADIANEXTRAOS = ""
+CANADIANEXTRAOS = "linux-uclibc linux-musl"
MODIFYTOS ??= "1"
python () {
archs = d.getVar('PACKAGE_ARCHS', True).split()
@@ -27,25 +27,44 @@ python () {
# Allow the following code segment to be disabled, e.g. meta-environment
if d.getVar("MODIFYTOS", True) != "1":
return
- # 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))
+ tos = d.getVar("TARGET_OS", True)
+ whitelist = []
+ for variant in ["", "spe", "x32", "eabi"]:
+ for libc in ["", "uclibc", "musl"]:
+ 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", True))
+
+ for n in ["PROVIDES", "DEPENDS"]:
+ d.setVar(n, d.getVar(n, 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))
+ # 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", True)
+ if tarch == "x86_64":
+ d.setVar("LIBCEXTENSION", "")
+ d.setVar("ABIEXTENSION", "")
+ d.appendVar("CANADIANEXTRAOS", " linux-gnux32 linux-uclibcx32 linux-muslx32")
+ 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 linux-uclibcspe linux-muslspe")
+ if tarch == "arm":
+ d.setVar("TARGET_OS", "linux-gnueabi")
+ else:
+ d.setVar("TARGET_OS", "linux")
}
MULTIMACH_TARGET_SYS = "${PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}"