mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

recipes-qt: add x11 to required DISTRO_FEATURES

Browse Source 
* 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

(From OE-Core rev: fda535d5b5239b091c79e957f68a45d4eab0ab5d)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Jansa
2015-01-22 17:39:46 +01:00
committed by Richard Purdie
parent 6618cff562
commit 6e02676d2c
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/qt4x11.bbclass
+4 -1
View File
@@ -1,7 +1,10 @@
QT4DEPENDS ?= "qt4-x11 " QT4DEPENDS ?= "qt4-x11 "
DEPENDS_prepend = "${QT4DEPENDS}" DEPENDS_prepend = "${QT4DEPENDS}"
inherit qmake2 # depends on qt4-x11
REQUIRED_DISTRO_FEATURES += "x11"
inherit qmake2 distro_features_check
QT_BASE_NAME = "qt4" QT_BASE_NAME = "qt4"
QT_DIR_NAME = "qt4" QT_DIR_NAME = "qt4"
meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb
+4
View File
@@ -4,6 +4,10 @@ QTLIBPREFIX = ""
require packagegroup-qt-toolchain-target.inc require packagegroup-qt-toolchain-target.inc
inherit distro_features_check
# depends on qt4-x11-free
REQUIRED_DISTRO_FEATURES = "x11"
RDEPENDS_${PN} += " \ RDEPENDS_${PN} += " \
qt4-x11-free-dev \ qt4-x11-free-dev \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'libqtopengl4-dev', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'libqtopengl4-dev', '', d)} \