[oe-commits] Martin Jansa : recipes-qt: add x11 to required DISTRO_FEATURES
git at git.openembedded.org
git at git.openembedded.org
Thu Jan 29 10:38:39 UTC 2015
Module: openembedded-core.git
Branch: master-next
Commit: fda535d5b5239b091c79e957f68a45d4eab0ab5d
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=fda535d5b5239b091c79e957f68a45d4eab0ab5d
Author: Martin Jansa <martin.jansa at gmail.com>
Date: Thu Jan 22 17:39:46 2015 +0100
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
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
meta/classes/qt4x11.bbclass | 5 ++++-
meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb | 4 ++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/meta/classes/qt4x11.bbclass b/meta/classes/qt4x11.bbclass
index b06e15d..6f06d34 100644
--- a/meta/classes/qt4x11.bbclass
+++ b/meta/classes/qt4x11.bbclass
@@ -1,7 +1,10 @@
QT4DEPENDS ?= "qt4-x11 "
DEPENDS_prepend = "${QT4DEPENDS}"
-inherit qmake2
+# depends on qt4-x11
+REQUIRED_DISTRO_FEATURES += "x11"
+
+inherit qmake2 distro_features_check
QT_BASE_NAME = "qt4"
QT_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 0e7c800..772c151 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 = ""
require packagegroup-qt-toolchain-target.inc
+inherit distro_features_check
+# depends on qt4-x11-free
+REQUIRED_DISTRO_FEATURES = "x11"
+
RDEPENDS_${PN} += " \
qt4-x11-free-dev \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'libqtopengl4-dev', '', d)} \
More information about the Openembedded-commits
mailing list