[OE-core] [PATCH dylan, master] Fix meta-toolchain-qte SDK build for x11-less DISTRO

Nicolas Dechesne nicolas.dechesne at linaro.org
Wed Jun 5 07:24:27 UTC 2013


When building QTe SDK for a DISTRO that does not have x11 FEATURES,
building meta-toolchain-qte failed because it unconditionally pulls in
nativesdk-libx11. The 'culprit' is meta/recipes-qt/qt4/nativesdk-qt4-tools.inc.

The fix is inspired from the following commits:

abf2ab7 dbus: only use x11 if DISTRO_FEATURES has selected it
ba22cfa cairo: only use x11 if selected in DISTRO_FEATURES

Signed-off-by: Nicolas Dechesne <nicolas.dechesne at linaro.org>
---
 meta/recipes-qt/qt4/nativesdk-qt4-tools.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
index cfc6fd8..3725cac 100644
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
@@ -1,5 +1,6 @@
 DESCRIPTION = "SDK tools for Qt/[X11|Mac|Embedded] version 4.x"
-DEPENDS = "nativesdk-zlib nativesdk-dbus nativesdk-libx11 qt4-native"
+X11DEPENDS = "nativesdk-libx11"
+DEPENDS = "nativesdk-zlib nativesdk-dbus qt4-native ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
 SECTION = "libs"
 HOMEPAGE = "http://qt.nokia.com"
 LICENSE = "LGPLv2.1 | GPLv3"
-- 
1.8.1.2




More information about the Openembedded-core mailing list