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

login
register
mail settings
Submitter Andreas Oberritter
Date Feb. 22, 2012, 11:26 a.m.
Message ID <1329910007-8441-2-git-send-email-obi@opendreambox.org>
Download mbox | patch
Permalink /patch/21565/
State New
Headers show

Comments

Andreas Oberritter - Feb. 22, 2012, 11:26 a.m.
* Drop dependency on GNOME if x11 is disabled.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
 meta/recipes-support/libsoup/libsoup-2.4_2.36.1.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Koen Kooi - Feb. 22, 2012, 12:56 p.m.
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@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.

regards,

Koen
Khem Raj - Feb. 24, 2012, 8:10 a.m.
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@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 ?
Andreas Oberritter - Feb. 24, 2012, 1:27 p.m.
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@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.

Regards,
Andreas

[1] http://git.openembedded.org/openembedded-core-contrib/commit/?h=obi/current&id=5c7c62268aa56a5d4d58764653ef95a9deb683ad
Richard Purdie - Feb. 24, 2012, 3:05 p.m.
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@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

Patch

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)}"
 
 SRC_URI = "${GNOME_MIRROR}/libsoup/2.36/libsoup-${PV}.tar.bz2"