From 37a841321dca1314c9844d8d4665b5ff1e28a40f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 28 Jan 2015 15:50:13 +0100 Subject: recipes: add x11 to required DISTRO_FEATURES Signed-off-by: Martin Jansa --- meta-oe/recipes-devtools/python/python-pyqt_4.11.3.bb | 4 +++- meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'meta-oe/recipes-devtools') diff --git a/meta-oe/recipes-devtools/python/python-pyqt_4.11.3.bb b/meta-oe/recipes-devtools/python/python-pyqt_4.11.3.bb index 140456e17e..989f2cf515 100644 --- a/meta-oe/recipes-devtools/python/python-pyqt_4.11.3.bb +++ b/meta-oe/recipes-devtools/python/python-pyqt_4.11.3.bb @@ -22,7 +22,9 @@ S = "${WORKDIR}/PyQt-x11-gpl-${PV}" PARALLEL_MAKE = "" -inherit qmake2 pythonnative python-dir +inherit qmake2 pythonnative python-dir distro_features_check +# depends on qt4-x11-free +REQUIRED_DISTRO_FEATURES = "x11" DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager" diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb index 1177d03688..14c6ce54c0 100644 --- a/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb +++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb @@ -35,7 +35,9 @@ S = "${WORKDIR}/${BPN}${PV}/unix" VER = "${@os.path.splitext(d.getVar('PV', True))[0]}" LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/${PV}/lib" -inherit autotools +inherit autotools distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" EXTRA_OECONF = "\ --enable-threads \ -- cgit v1.2.3-54-g00ecf