Patchwork [4/4] qt4-tools: Drop libx11 dependency when building without 'x11' distro feature

login
register
mail settings
Submitter Otavio Salvador
Date Feb. 16, 2013, 9:20 p.m.
Message ID <1361049644-27904-4-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/44725/
State New
Headers show

Comments

Otavio Salvador - Feb. 16, 2013, 9:20 p.m.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-qt/qt4/nativesdk-qt4-tools.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
index cfc6fd8..564f1d2 100644
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
@@ -1,10 +1,10 @@ 
 DESCRIPTION = "SDK tools for Qt/[X11|Mac|Embedded] version 4.x"
-DEPENDS = "nativesdk-zlib nativesdk-dbus nativesdk-libx11 qt4-native"
+DEPENDS = "nativesdk-zlib nativesdk-dbus ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)} qt4-native"
 SECTION = "libs"
 HOMEPAGE = "http://qt.nokia.com"
 LICENSE = "LGPLv2.1 | GPLv3"
 
-INC_PR = "r13"
+INC_PR = "r14"
 
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"