summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2019-02-04 11:36:12 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2019-02-04 10:42:52 +0000
commitafaeb8bec1eafd0ff29a85d399476af0a9000943 (patch)
treed6f5f9d28c10491465835d09a254e111204cf5bc
parentb0e24e16545c904440f8ff33892c9bb3e0b3c279 (diff)
downloadmeta-boot2qt-afaeb8bec1eafd0ff29a85d399476af0a9000943.tar.gz
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 <mikko.gronoff@qt.io>
-rw-r--r--meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb6
1 files changed, 5 insertions, 1 deletions
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"
37 37
38MACHINE_EXTRA_INSTALL_SDK ?= "" 38MACHINE_EXTRA_INSTALL_SDK ?= ""
39 39
40GCC-SANITIZERS ?= "gcc-sanitizers"
41GCC-SANITIZERS_mipsarch = ""
42GCC-SANITIZERS_libc-musl = ""
43
40RDEPENDS_${PN} += " \ 44RDEPENDS_${PN} += " \
41 ${MACHINE_EXTRA_INSTALL_SDK} \ 45 ${MACHINE_EXTRA_INSTALL_SDK} \
42 packagegroup-core-standalone-sdk-target \ 46 packagegroup-core-standalone-sdk-target \
43 ${@contains_regex('MACHINEOVERRIDES', '(x86_64|i.86|powerpc|sparc|s390|arm|aarch64)', 'gcc-sanitizers', '', d)} \ 47 ${GCC-SANITIZERS} \
44 \ 48 \
45 qt3d-dev \ 49 qt3d-dev \
46 qt3d-runtime-dev \ 50 qt3d-runtime-dev \