summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2013-12-05 13:51:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-09 18:01:46 +0000
commitcb9136dd8e1f14bd161c3f8bde46cf23bf947518 (patch)
treea256e89ed1068b580097688d42f837ccf5d65a5a
parent85bfdda3617cc228171f2fe61822296feb74dd5c (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-graphics/xorg-lib/libpciaccess_0.13.2.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/pixman_0.32.4.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/xorg-lib-common.inc8
3 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.2.bb b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.2.bb
index 6da86f24b6..d837bbd047 100644
--- a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.2.bb
+++ b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.2.bb
@@ -10,3 +10,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068"
10 10
11SRC_URI[md5sum] = "b7c0d3afce14eedca57312a3141ec13a" 11SRC_URI[md5sum] = "b7c0d3afce14eedca57312a3141ec13a"
12SRC_URI[sha256sum] = "abab8c2b050afb89bc29280e9c6b50ec5867174960d88bfb81a01036ec20de19" 12SRC_URI[sha256sum] = "abab8c2b050afb89bc29280e9c6b50ec5867174960d88bfb81a01036ec20de19"
13
14REQUIRED_DISTRO_FEATURES = ""
diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.32.4.bb b/meta/recipes-graphics/xorg-lib/pixman_0.32.4.bb
index d1f3df7f9c..51cca5d13a 100644
--- a/meta/recipes-graphics/xorg-lib/pixman_0.32.4.bb
+++ b/meta/recipes-graphics/xorg-lib/pixman_0.32.4.bb
@@ -33,3 +33,5 @@ SRC_URI += "\
33 33
34SRC_URI[md5sum] = "cdb566504fe9daf6728c7b03cc7ea228" 34SRC_URI[md5sum] = "cdb566504fe9daf6728c7b03cc7ea228"
35SRC_URI[sha256sum] = "ae2bd664057e330d41b40336ed296d3512318ce7f2401cc42601f2613d371e4c" 35SRC_URI[sha256sum] = "ae2bd664057e330d41b40336ed296d3512318ce7f2401cc42601f2613d371e4c"
36
37REQUIRED_DISTRO_FEATURES = ""
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
12S = "${WORKDIR}/${XORG_PN}-${PV}" 12S = "${WORKDIR}/${XORG_PN}-${PV}"
13 13
14inherit autotools pkgconfig 14inherit autotools distro_features_check pkgconfig
15 15
16EXTRA_OECONF = "--disable-specs --without-groff --without-ps2pdf --without-fop --without-xmlto" 16EXTRA_OECONF = "--disable-specs --without-groff --without-ps2pdf --without-fop --without-xmlto"
17EXTRA_OECONF_append_libc-glibc = " --disable-malloc0returnsnull" 17EXTRA_OECONF_append_libc-glibc = " --disable-malloc0returnsnull"
@@ -20,8 +20,4 @@ EXTRA_OECONF_append_libc-uclibc = " --enable-malloc0returnsnull"
20UNKNOWN_CONFIGURE_WHITELIST += "--enable-malloc0returnsnull --disable-malloc0returnsnull \ 20UNKNOWN_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
23python () { 23REQUIRED_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}