summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2015-01-22 17:39:46 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-29 15:36:51 +0000
commit6e02676d2c9d3d7f7dccf9dbd24825a7de19f602 (patch)
tree3d6a71493c671ad389535ef920510f88a6e82364 /meta
parent6618cff5625dc5ab5e07a4bd4ad00b21baaaf5ef (diff)
downloadpoky-6e02676d2c9d3d7f7dccf9dbd24825a7de19f602.tar.gz
recipes-qt: add x11 to required DISTRO_FEATURES
* it's not complete, but recipes depending on virtual/libx11 are easiest to spot, I've long list of PNBLACKLIST for all recipes which cannot be built in distro without x11 in DISTRO_FEATURES (From OE-Core rev: fda535d5b5239b091c79e957f68a45d4eab0ab5d) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/qt4x11.bbclass5
-rw-r--r--meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb4
2 files changed, 8 insertions, 1 deletions
diff --git a/meta/classes/qt4x11.bbclass b/meta/classes/qt4x11.bbclass
index b06e15d29e..6f06d34755 100644
--- a/meta/classes/qt4x11.bbclass
+++ b/meta/classes/qt4x11.bbclass
@@ -1,7 +1,10 @@
1QT4DEPENDS ?= "qt4-x11 " 1QT4DEPENDS ?= "qt4-x11 "
2DEPENDS_prepend = "${QT4DEPENDS}" 2DEPENDS_prepend = "${QT4DEPENDS}"
3 3
4inherit qmake2 4# depends on qt4-x11
5REQUIRED_DISTRO_FEATURES += "x11"
6
7inherit qmake2 distro_features_check
5 8
6QT_BASE_NAME = "qt4" 9QT_BASE_NAME = "qt4"
7QT_DIR_NAME = "qt4" 10QT_DIR_NAME = "qt4"
diff --git a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb b/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb
index 0e7c800946..772c151d25 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb
@@ -4,6 +4,10 @@ QTLIBPREFIX = ""
4 4
5require packagegroup-qt-toolchain-target.inc 5require packagegroup-qt-toolchain-target.inc
6 6
7inherit distro_features_check
8# depends on qt4-x11-free
9REQUIRED_DISTRO_FEATURES = "x11"
10
7RDEPENDS_${PN} += " \ 11RDEPENDS_${PN} += " \
8 qt4-x11-free-dev \ 12 qt4-x11-free-dev \
9 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'libqtopengl4-dev', '', d)} \ 13 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'libqtopengl4-dev', '', d)} \