diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2015-01-22 17:39:46 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-29 10:37:53 +0000 |
| commit | fda535d5b5239b091c79e957f68a45d4eab0ab5d (patch) | |
| tree | 127a61f8e6b44412733c25f6d3f074b2ad9a5704 | |
| parent | 929ccf90d9cbf6a10a263b59e5f02b0542d73899 (diff) | |
| download | openembedded-core-fda535d5b5239b091c79e957f68a45d4eab0ab5d.tar.gz openembedded-core-fda535d5b5239b091c79e957f68a45d4eab0ab5d.tar.bz2 openembedded-core-fda535d5b5239b091c79e957f68a45d4eab0ab5d.zip | |
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@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/classes/qt4x11.bbclass | 5 | ||||
| -rw-r--r-- | meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb | 4 |
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 @@ 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)} \ |