[4/4] recipes-qt: add x11 to required DISTRO_FEATURES
Submitted by Martin Jansa on July 24, 2014, 1:42 p.m.
|
Patch ID: 76603
Details
Commit Message
@@ -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"
@@ -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)} \
@@ -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
* 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> --- meta/classes/qt4x11.bbclass | 5 ++++- meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb | 4 ++++ meta/recipes-qt/qt4/qt4-x11-free.inc | 5 ++++- 3 files changed, 12 insertions(+), 2 deletions(-)