From 21caf9ba0ffc1371c261a1a9c0e930a0ee2c277d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 29 Aug 2017 16:42:02 +0300 Subject: sdk: don't add qtwayland-scanner to mingw toolchain There are number of wayland dependencies that will not compile for mingw toolchain. Task-number: QTBUG-62800 Change-Id: I2ffda4eb00831f21a27202d0a901cdb9719fe7f7 Reviewed-by: Mikko Gronoff --- .../nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb index 036410c..a65435f 100644 --- a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb +++ b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb @@ -33,6 +33,12 @@ PR = "r0" inherit nativesdk packagegroup qtquickcompiler +python __anonymous() { + overrides = d.getVar("OVERRIDES", True).split(":") + if "mingw32" not in overrides: + d.appendVar("OVERRIDES", ":linux") +} + RDEPENDS_${PN} += "\ nativesdk-packagegroup-b2qt-embedded-toolchain-host \ nativesdk-qttools-tools \ @@ -42,5 +48,8 @@ RDEPENDS_${PN} += "\ nativesdk-qtdeclarative-staticdev \ nativesdk-qt3d-tools \ nativesdk-qtscxml-tools \ + " + +RDEPENDS_${PN}_append_linux = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-qtwayland-tools', '', d)} \ " -- cgit v1.2.3-54-g00ecf