From cb9136dd8e1f14bd161c3f8bde46cf23bf947518 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Thu, 5 Dec 2013 13:51:24 +0100 Subject: xorg-lib-common.inc: use REQUIRED_DISTRO_FEATURES variable Convert custom DISTRO_FEATURES test to distro_features_check.bbclass, and keep exceptions for libpciaccess and pixman. (From OE-Core rev: 5050b4a023d8eff3198346bd6e631e87487deb94) Signed-off-by: Andreas Oberritter Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'meta/recipes-graphics/xorg-lib/xorg-lib-common.inc') diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc index 07b0373308..231776a21c 100644 --- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc @@ -11,7 +11,7 @@ SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" -inherit autotools pkgconfig +inherit autotools distro_features_check pkgconfig EXTRA_OECONF = "--disable-specs --without-groff --without-ps2pdf --without-fop --without-xmlto" EXTRA_OECONF_append_libc-glibc = " --disable-malloc0returnsnull" @@ -20,8 +20,4 @@ EXTRA_OECONF_append_libc-uclibc = " --enable-malloc0returnsnull" UNKNOWN_CONFIGURE_WHITELIST += "--enable-malloc0returnsnull --disable-malloc0returnsnull \ --disable-specs --without-groff --without-ps2pdf --without-fop --without-xmlto" -python () { - whitelist = [ "pixman", "libpciaccess" ] - if not d.getVar('BPN', True) in whitelist and not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d): - raise bb.parse.SkipPackage("'x11' not in DISTRO_FEATURES") -} +REQUIRED_DISTRO_FEATURES ?= "x11" -- cgit v1.2.3-54-g00ecf