Patchwork avahi: only use gtk if DISTRO_FEATURES includes x11

login
register
mail settings
Submitter Phil Blundell
Date Sept. 7, 2011, 8:23 p.m.
Message ID <1315427028.4368.2.camel@lenovo.internal.reciva.com>
Download mbox | patch
Permalink /patch/11213/
State New, archived
Headers show

Comments

Phil Blundell - Sept. 7, 2011, 8:23 p.m.
Otherwise avahi isn't buildable for an x11-less DISTRO.

Signed-off-by: Phil Blundell <philb@gnu.org>
---
 meta/recipes-connectivity/avahi/avahi.inc |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
Saul Wold - Sept. 8, 2011, 3:55 a.m.
On 09/07/2011 01:23 PM, Phil Blundell wrote:
> Otherwise avahi isn't buildable for an x11-less DISTRO.
>
> Signed-off-by: Phil Blundell<philb@gnu.org>
> ---
>   meta/recipes-connectivity/avahi/avahi.inc |    4 +++-
>   1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
> index dc7a5ae..24ea458 100644
> --- a/meta/recipes-connectivity/avahi/avahi.inc
> +++ b/meta/recipes-connectivity/avahi/avahi.inc
> @@ -14,7 +14,8 @@ SECTION = "network"
>   # python scripts are under GPLv2+
>   LICENSE = "GPLv2+&  LGPLv2.1+"
>
> -DEPENDS = "expat libcap libdaemon dbus glib-2.0 gtk+ libglade"
> +X11DEPENDS = "gtk+ libglade"
> +DEPENDS = "expat libcap libdaemon dbus glib-2.0 ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
>
>   SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
>             file://00avahi-autoipd \
> @@ -30,6 +31,7 @@ EXTRA_OECONF = "--with-distro=debian \
>                --disable-mono \
>                --disable-monodoc \
>                --disable-gtk3 \
> +	     ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-gtk', '--disable-gtk', d)} \
>                --disable-qt3 \
>                --disable-qt4 \
>                --disable-python \

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index dc7a5ae..24ea458 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -14,7 +14,8 @@  SECTION = "network"
 # python scripts are under GPLv2+
 LICENSE = "GPLv2+ & LGPLv2.1+"
 
-DEPENDS = "expat libcap libdaemon dbus glib-2.0 gtk+ libglade"
+X11DEPENDS = "gtk+ libglade"
+DEPENDS = "expat libcap libdaemon dbus glib-2.0 ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
 
 SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
           file://00avahi-autoipd \
@@ -30,6 +31,7 @@  EXTRA_OECONF = "--with-distro=debian \
              --disable-mono \
              --disable-monodoc \
              --disable-gtk3 \
+	     ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-gtk', '--disable-gtk', d)} \
              --disable-qt3 \
              --disable-qt4 \
              --disable-python \