From afaeb8bec1eafd0ff29a85d399476af0a9000943 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 4 Feb 2019 11:36:12 +0200 Subject: fix ipkg issue with gcc-sanitizers on toolchains Simplify the selection for gcc-sanitizers, with disabling it on mips and when using musl. Change-Id: I3c8303d579a8d0b416a28ef139c4b865df4249d2 Reviewed-by: Mikko Gronoff --- .../packagegroup-b2qt-embedded-qt5-toolchain-target.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb index 9fac3f6..8807cf7 100644 --- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb +++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb @@ -37,10 +37,14 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" MACHINE_EXTRA_INSTALL_SDK ?= "" +GCC-SANITIZERS ?= "gcc-sanitizers" +GCC-SANITIZERS_mipsarch = "" +GCC-SANITIZERS_libc-musl = "" + RDEPENDS_${PN} += " \ ${MACHINE_EXTRA_INSTALL_SDK} \ packagegroup-core-standalone-sdk-target \ - ${@contains_regex('MACHINEOVERRIDES', '(x86_64|i.86|powerpc|sparc|s390|arm|aarch64)', 'gcc-sanitizers', '', d)} \ + ${GCC-SANITIZERS} \ \ qt3d-dev \ qt3d-runtime-dev \ -- cgit v1.2.3-54-g00ecf