Patchwork [PATCH/RFC] xorg-lib: don't build libs unless requested by DISTRO_FEATURES

login
mail settings
Submitter Andreas Oberritter
Date Feb. 24, 2012, 6:40 p.m.
Message ID <4F47D99F.6040003@opendreambox.org>
Download mbox | patch
Permalink /patch/21957/
State Accepted
Commit 384912b4719a77b2e5f6673066e75258df130f5d
Headers show

Comments

Andreas Oberritter - Feb. 24, 2012, 6:40 p.m.
On 24.02.2012 19:28, Saul Wold wrote:
> On 02/09/2012 05:27 PM, Andreas Oberritter wrote:
>> * 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>
>> ---
>>   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")
>> +}
> 
> Merged into OE-core
> 
> Thanks
>     Sau!

Thanks! You've missed v2, though. See below for an incremental patch.

Regards,
Andreas

From ec3b779fdca465afade0f56140ab85ac4bfc9e61 Mon Sep 17 00:00:00 2001
From: Andreas Oberritter <obi@opendreambox.org>
Date: Fri, 10 Feb 2012 02:10:15 +0100
Subject: [PATCH] xorg-lib: don't build libs unless requested by
 DISTRO_FEATURES (fix up)

* Improve error message as suggested by Koen.
  (This got lost when v1 was committed instead of v2)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
 meta/recipes-graphics/xorg-lib/xorg-lib-common.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Richard Purdie - Feb. 26, 2012, 11:42 a.m.
On Fri, 2012-02-24 at 19:40 +0100, Andreas Oberritter wrote:
> > Merged into OE-core
> > 
> > Thanks
> >     Sau!
> 
> Thanks! You've missed v2, though. See below for an incremental patch.

I've merged the fixup, thanks.

Richard

Patch

diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
index 3d5d378..73a4d1d 100644
--- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
+++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
@@ -18,5 +18,5 @@  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")
+                raise bb.parse.SkipPackage("'x11' not in DISTRO_FEATURES")
 }