All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH dylan, master] Fix meta-toolchain-qte SDK build for x11-less DISTRO
@ 2013-06-05  7:24 Nicolas Dechesne
  2013-06-05 16:30 ` Saul Wold
  2013-06-05 16:40 ` Denys Dmytriyenko
  0 siblings, 2 replies; 17+ messages in thread
From: Nicolas Dechesne @ 2013-06-05  7:24 UTC (permalink / raw)
  To: openembedded-core; +Cc: Nicolas Dechesne

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@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



^ permalink raw reply related	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2013-06-07 12:19 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-05  7:24 [PATCH dylan, master] Fix meta-toolchain-qte SDK build for x11-less DISTRO Nicolas Dechesne
2013-06-05 16:30 ` Saul Wold
2013-06-05 16:32   ` Nicolas Dechesne
2013-06-05 16:58     ` Saul Wold
2013-06-05 17:12       ` Otavio Salvador
2013-06-05 17:19         ` Saul Wold
2013-06-05 17:23           ` Nicolas Dechesne
2013-06-05 17:43             ` Otavio Salvador
2013-06-05 20:07               ` Denys Dmytriyenko
2013-06-05 20:10                 ` Otavio Salvador
2013-06-05 20:53                   ` Saul Wold
2013-06-05 20:56                     ` Otavio Salvador
2013-06-05 20:58                       ` Denys Dmytriyenko
2013-06-06 15:46                         ` Richard Purdie
2013-06-06 16:28                           ` Otavio Salvador
2013-06-07 12:19                           ` Nicolas Dechesne
2013-06-05 16:40 ` Denys Dmytriyenko

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.