From fda535d5b5239b091c79e957f68a45d4eab0ab5d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 22 Jan 2015 17:39:46 +0100 Subject: 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 Signed-off-by: Ross Burton --- 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 b06e15d29e..6f06d34755 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 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 = "" 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)} \ -- cgit 1.2.3-korg