diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2014-06-25 21:48:55 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-07-13 14:35:39 +0200 |
| commit | a90aa18c6980c3391b8618734b01ceb6164c1564 (patch) | |
| tree | 3bb388cf7fefc555b9682e870f660128cddab7b6 | |
| parent | a403e5766a712277897da245707daabcc415b519 (diff) | |
| download | openembedded-core-contrib-a90aa18c6980c3391b8618734b01ceb6164c1564.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
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta/classes/qt4x11.bbclass | 5 | ||||
| -rw-r--r-- | meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-x11-free.inc | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/meta/classes/qt4x11.bbclass b/meta/classes/qt4x11.bbclass index 65d196afc6..bdbfc4a925 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)} \ diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index 3b1e0fecad..b621f8ec64 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc @@ -8,6 +8,9 @@ DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender li PROVIDES += "qt4-x11" QT4DEPENDS = "" +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + INC_PR = "r50" QT_GLFLAGS ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " @@ -21,7 +24,7 @@ QT_BASE_LIB ?= "libqt" QT_KDE_FLAGS ?= "-accessibility -sm" QT_DISTRO_FLAGS ?= "${QT_KDE_FLAGS}" -inherit qt4x11 +inherit qt4x11 distro_features_check do_install_append() { # fix pkgconfig, libtool and prl files |