* [PATCH] avahi: only use gtk if DISTRO_FEATURES includes x11
@ 2011-09-07 20:23 Phil Blundell
2011-09-08 3:55 ` Saul Wold
0 siblings, 1 reply; 2+ messages in thread
From: Phil Blundell @ 2011-09-07 20:23 UTC (permalink / raw)
To: openembedded-core
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 \
--
1.7.4.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] avahi: only use gtk if DISTRO_FEATURES includes x11
2011-09-07 20:23 [PATCH] avahi: only use gtk if DISTRO_FEATURES includes x11 Phil Blundell
@ 2011-09-08 3:55 ` Saul Wold
0 siblings, 0 replies; 2+ messages in thread
From: Saul Wold @ 2011-09-08 3:55 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Phil Blundell
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!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-09-08 4:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-07 20:23 [PATCH] avahi: only use gtk if DISTRO_FEATURES includes x11 Phil Blundell
2011-09-08 3:55 ` Saul Wold
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.