From: Dmitry Eremin-Solenikov Date: Fri, 24 Apr 2015 20:02:21 +0000 (+0300) Subject: qt4-x11-free: make virtual/libgl dependency conditional X-Git-Tag: 2015-10~1879 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=aef3ffd3b3a1fa72dfccf1fd4b9f8cf9d3812fa8;p=openembedded-core.git 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 Signed-off-by: Ross Burton --- 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 = ""