[oe-commits] Dmitry Eremin-Solenikov : qt4-x11-free: make virtual/ libgl dependency conditional

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: aef3ffd3b3a1fa72dfccf1fd4b9f8cf9d3812fa8
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=aef3ffd3b3a1fa72dfccf1fd4b9f8cf9d3812fa8

Author: Dmitry Eremin-Solenikov <dmitry_eremin at mentor.com>
Date:   Fri Apr 24 23:02:21 2015 +0300

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 at mentor.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-qt/qt4/qt4-x11-free.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 3b1e0fe..835fc96 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 = ""