diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2012-02-10 02:27:54 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-23 23:59:14 +0000 |
| commit | a101bc85adcc915f151348107e850b8998a395b0 (patch) | |
| tree | b86806f0516659bb5fe82a8fa473aa11daa19fc2 /meta/recipes-graphics | |
| parent | 6a74c2050de4540deaf4e855bdf7aec4518f648a (diff) | |
| download | openembedded-core-a101bc85adcc915f151348107e850b8998a395b0.tar.gz openembedded-core-a101bc85adcc915f151348107e850b8998a395b0.tar.bz2 openembedded-core-a101bc85adcc915f151348107e850b8998a395b0.zip | |
xorg-lib: don't build libs unless requested by DISTRO_FEATURES
* If 'x11' is not set in DISTRO_FEATURES, then skip all
recipes using xorg-lib-common.inc instead of only those
using libx11.inc.
* One exception: pixman, which is not only used by xorg,
but also by cairo.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Diffstat (limited to 'meta/recipes-graphics')
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11.inc | 5 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc index 748a48cef3..9057edc746 100644 --- a/meta/recipes-graphics/xorg-lib/libx11.inc +++ b/meta/recipes-graphics/xorg-lib/libx11.inc @@ -49,8 +49,3 @@ do_compile_prepend() { # Multiple libx11 derivatives from from this file and are selected by virtual/libx11 # A world build should only build the correct version, not all of them. EXCLUDE_FROM_WORLD = "1" - -python () { - if not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d): - raise bb.parse.SkipPackage("X11 not enabled for this DISTRO") -} diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc index d106054ef1..3d5d378c87 100644 --- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc @@ -14,3 +14,9 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig EXTRA_OECONF = "--enable-malloc0returnsnull --with-fop=no --without-xmlto" + +python () { + whitelist = [ "pixman" ] + 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 enabled for this DISTRO") +} |