[OE-core] [PATCH 1/5] libsoup-2.4: don't depend on libgnome-keyring unless x11 is defined

[Richard Purdie]

On Fri, 2012-02-24 at 14:27 +0100, Andreas Oberritter wrote:
> On 24.02.2012 09:10, Khem Raj wrote:
> > On (22/02/12 13:56), Koen Kooi wrote:
> >>
> >> Op 22 feb. 2012, om 12:26 heeft Andreas Oberritter het volgende geschreven:
> >>
> >>> * Drop dependency on GNOME if x11 is disabled.
> >>>
> >>> Signed-off-by: Andreas Oberritter <obi at opendreambox.org>
> >>> ---
> >>> meta/recipes-support/libsoup/libsoup-2.4_2.36.1.bb |    4 ++--
> >>> 1 files changed, 2 insertions(+), 2 deletions(-)
> >>>
> >>> diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.36.1.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.36.1.bb
> >>> index 8e6ef26..861a1aa 100644
> >>> --- a/meta/recipes-support/libsoup/libsoup-2.4_2.36.1.bb
> >>> +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.36.1.bb
> >>> @@ -6,9 +6,9 @@ LICENSE = "LGPLv2"
> >>> LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
> >>>
> >>> SECTION = "x11/gnome/libs"
> >>> -PR = "r1"
> >>> +PR = "r2"
> >>>
> >>> -DEPENDS = "glib-2.0 gnutls libxml2 libproxy sqlite3 libgnome-keyring"
> >>> +DEPENDS = "glib-2.0 gnutls libxml2 libproxy sqlite3 ${@base_contains('DISTRO_FEATURES', 'x11', 'libgnome-keyring', '', d)}"
> >>
> >> that one likely needs a --disable-something to be deterministic.
> > 
> > may be --without-gnome or --disable-gnome-keyring ?
> 
> The flag --without-gnome is right. I've updated this patch [1],
> but I'm waiting before resubmitting it, because after Richard's
> comments I'm unsure which distro feature should be tested or
> whether PACKAGECONFIG should be used.

I think the answer is we should have PACKAGECONFIG and something which
gets the defaults for that from distro features. That should actually
simplify the code a little.

I'm also wondering if a good name for the distro feature flag would be
"gnomeapi" ?

Cheers,

Richard