summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dmitry_eremin@mentor.com>2015-04-24 23:02:21 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-14 11:41:11 +0100
commitaef3ffd3b3a1fa72dfccf1fd4b9f8cf9d3812fa8 (patch)
tree4fba3127166ce1ce6caec3b581565eb9603b39c3
parente025d1ff02795fc9236b41606e916749f0d5e959 (diff)
downloadopenembedded-core-aef3ffd3b3a1fa72dfccf1fd4b9f8cf9d3812fa8.tar.gz
openembedded-core-aef3ffd3b3a1fa72dfccf1fd4b9f8cf9d3812fa8.tar.bz2
openembedded-core-aef3ffd3b3a1fa72dfccf1fd4b9f8cf9d3812fa8.zip
qt4-x11-free: make virtual/libgl dependency conditional
Make qt4-x11-free depend on virtual/libgl only if the DISTRO_FEATURES contains opengl. Otherwise there will be no package to fullfil this dependency. Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 3b1e0fecad..835fc966f5 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -4,7 +4,8 @@ SUMMARY = "Cross-platform UI toolkit and application framework (X11 version)"
DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version."
HOMEPAGE = "http://qt-project.org/"
SECTION = "x11/libs"
-DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
+DEPENDS += "virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
+DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}"
PROVIDES += "qt4-x11"
QT4DEPENDS = ""