diff options
| author | Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com> | 2015-04-24 23:02:21 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-14 11:43:57 +0100 |
| commit | 9f8391602ba56d67b586a92ea5a1cd85f2f56259 (patch) | |
| tree | e57b283d31aa5b17ca740cd79f846e20d0a96163 /meta/recipes-qt | |
| parent | f6e13ec5357f8cfe3ee3a5d3c6c4ef84076847ef (diff) | |
| download | poky-9f8391602ba56d67b586a92ea5a1cd85f2f56259.tar.gz | |
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.
(From OE-Core rev: aef3ffd3b3a1fa72dfccf1fd4b9f8cf9d3812fa8)
Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-x11-free.inc | 3 |
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)" | |||
| 4 | DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version." | 4 | DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version." |
| 5 | HOMEPAGE = "http://qt-project.org/" | 5 | HOMEPAGE = "http://qt-project.org/" |
| 6 | SECTION = "x11/libs" | 6 | SECTION = "x11/libs" |
| 7 | DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" | 7 | DEPENDS += "virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" |
| 8 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}" | ||
| 8 | PROVIDES += "qt4-x11" | 9 | PROVIDES += "qt4-x11" |
| 9 | QT4DEPENDS = "" | 10 | QT4DEPENDS = "" |
| 10 | 11 | ||