diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2013-12-05 13:51:24 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-09 18:01:46 +0000 |
commit | cb9136dd8e1f14bd161c3f8bde46cf23bf947518 (patch) | |
tree | a256e89ed1068b580097688d42f837ccf5d65a5a /meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | |
parent | 85bfdda3617cc228171f2fe61822296feb74dd5c (diff) | |
download | poky-cb9136dd8e1f14bd161c3f8bde46cf23bf947518.tar.gz |
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 <obi@opendreambox.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/xorg-lib-common.inc')
-rw-r--r-- | meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 8 |
1 files changed, 2 insertions, 6 deletions
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" | |||
11 | 11 | ||
12 | S = "${WORKDIR}/${XORG_PN}-${PV}" | 12 | S = "${WORKDIR}/${XORG_PN}-${PV}" |
13 | 13 | ||
14 | inherit autotools pkgconfig | 14 | inherit autotools distro_features_check pkgconfig |
15 | 15 | ||
16 | EXTRA_OECONF = "--disable-specs --without-groff --without-ps2pdf --without-fop --without-xmlto" | 16 | EXTRA_OECONF = "--disable-specs --without-groff --without-ps2pdf --without-fop --without-xmlto" |
17 | EXTRA_OECONF_append_libc-glibc = " --disable-malloc0returnsnull" | 17 | EXTRA_OECONF_append_libc-glibc = " --disable-malloc0returnsnull" |
@@ -20,8 +20,4 @@ EXTRA_OECONF_append_libc-uclibc = " --enable-malloc0returnsnull" | |||
20 | UNKNOWN_CONFIGURE_WHITELIST += "--enable-malloc0returnsnull --disable-malloc0returnsnull \ | 20 | UNKNOWN_CONFIGURE_WHITELIST += "--enable-malloc0returnsnull --disable-malloc0returnsnull \ |
21 | --disable-specs --without-groff --without-ps2pdf --without-fop --without-xmlto" | 21 | --disable-specs --without-groff --without-ps2pdf --without-fop --without-xmlto" |
22 | 22 | ||
23 | python () { | 23 | REQUIRED_DISTRO_FEATURES ?= "x11" |
24 | whitelist = [ "pixman", "libpciaccess" ] | ||
25 | if not d.getVar('BPN', True) in whitelist and not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d): | ||
26 | raise bb.parse.SkipPackage("'x11' not in DISTRO_FEATURES") | ||
27 | } | ||