From ad51ecbe912e3ab8f76b921d9f0e8cfbc23e5413 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Fri, 4 Dec 2020 15:29:04 +0000 Subject: [PATCH] external-arm-toolchain: check for TCLIBC being glibc The old TARGET_OS check doesn't work, as it only checks for uclibc and musl at the end, while TARGET_OS is usually "linux-musleabi", uclibc has been deprecated and new options like "newlib" and "baremetal" were added. Plus it only works for the target, but not SDK. Switch to simply checking for TCLIBC = glibc. Signed-off-by: Denys Dmytriyenko Reviewed-by: Sumit Garg Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- .../external-arm-toolchain/external-arm-toolchain.bb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb index 9f2b2f66..b44fd2f4 100644 --- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb +++ b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb @@ -670,13 +670,9 @@ SUMMARY_libitm-staticdev = "GNU transactional memory support library - static de EAT_VER_MAIN ??= "" - python () { if not d.getVar("EAT_VER_MAIN", False): raise bb.parse.SkipPackage("External ARM toolchain not configured (EAT_VER_MAIN not set).") - import re - notglibc = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None) or (re.match('.*musl$', d.getVar('TARGET_OS', True)) != None) - if notglibc: - raise bb.parse.SkipPackage("incompatible with target %s" % - d.getVar('TARGET_OS', True)) + if d.getVar('TCLIBC', True) != "glibc": + raise bb.parse.SkipPackage("incompatible with %s" % d.getVar('TCLIBC', True)) }