From patchwork Thu Feb 23 15:58:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 01/25] xorg-lib: don't build libs unless requested by DISTRO_FEATURES Date: Thu, 23 Feb 2012 15:58:05 -0000 From: Saul Wold X-Patchwork-Id: 21789 Message-Id: <79d8237046de1a44536af8a29de71a07630d286d.1330012543.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Andreas Oberritter * 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 --- meta/recipes-graphics/xorg-lib/libx11.inc | 5 ----- 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 748a48c..9057edc 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 d106054..3d5d378 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") +}