[Buildroot] [PATCH 1/1] package/avahi: add hidden libavahi-client option

From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
To: buildroot@buildroot.org
Cc: "Bernd Kuhls" <bernd.kuhls@t-online.de>,
	"Marcus Folkesson" <marcus.folkesson@gmail.com>,
	"Jörg Krause" <joerg.krause@embedded.rocks>,
	"Angelo Compagnucci" <angelo.compagnucci@gmail.com>,
	"Paul Cercueil" <paul@crapouillou.net>,
	"James Hilliard" <james.hilliard1@gmail.com>,
	"Simon Dawson" <spdawson@gmail.com>,
	"Olivier Schonken" <olivier.schonken@gmail.com>,
	"Fabrice Fontaine" <fontaine.fabrice@gmail.com>
Subject: [Buildroot] [PATCH 1/1] package/avahi: add hidden libavahi-client option
Date: Wed, 12 Jan 2022 21:31:17 +0100	[thread overview]
Message-ID: <20220112203117.3133159-1-fontaine.fabrice@gmail.com> (raw)

This hidden option will simplify packages depending on libavahi-client

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/avahi/Config.in                  | 6 ++++++
 package/cups-filters/cups-filters.mk     | 3 +--
 package/libiio/libiio.mk                 | 3 +--
 package/libostree/libostree.mk           | 6 +-----
 package/pipewire/pipewire.mk             | 3 +--
 package/shairport-sync/shairport-sync.mk | 6 +-----
 package/vlc/vlc.mk                       | 3 +--
 7 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/package/avahi/Config.in b/package/avahi/Config.in
index 95b01bfe92..67722d04a2 100644
--- a/package/avahi/Config.in
+++ b/package/avahi/Config.in
@@ -34,6 +34,12 @@ config BR2_PACKAGE_AVAHI_DAEMON
 	  The daemon registers local IP addresses and services using
 	  mDNS/DNS-SD.
 
+config BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT
+	bool
+	default y
+	depends on BR2_PACKAGE_AVAHI_DAEMON
+	depends on BR2_PACKAGE_DBUS
+
 config BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY
 	bool "libdns_sd compatibility (Bonjour)"
 	depends on BR2_PACKAGE_AVAHI_DAEMON
diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk
index 63b85f0b8b..c8f2dd0aae 100644
--- a/package/cups-filters/cups-filters.mk
+++ b/package/cups-filters/cups-filters.mk
@@ -45,8 +45,7 @@ else
 CUPS_FILTERS_CONF_OPTS += --disable-dbus
 endif
 
-# avahi support requires avahi-client, which needs avahi-daemon and dbus
-ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy)
+ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y)
 CUPS_FILTERS_DEPENDENCIES += avahi
 CUPS_FILTERS_CONF_OPTS += --enable-avahi
 else
diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk
index 38b2f83e6e..a4fe0d4541 100644
--- a/package/libiio/libiio.mk
+++ b/package/libiio/libiio.mk
@@ -65,8 +65,7 @@ else
 LIBIIO_CONF_OPTS += -DWITH_AIO=OFF
 endif
 
-# Avahi support in libiio requires avahi-client, which needs avahi-daemon and dbus
-ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy)
+ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y)
 LIBIIO_DEPENDENCIES += avahi
 LIBIIO_CONF_OPTS += -DHAVE_DNS_SD=ON
 else
diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk
index 22cb83d039..9cbf2848c9 100644
--- a/package/libostree/libostree.mk
+++ b/package/libostree/libostree.mk
@@ -37,11 +37,7 @@ else
 LIBOSTREE_CONF_OPTS += --without-openssl
 endif
 
-# Avahi support needs libavahi-client, which is built by avahi if avahi-daemon
-# and dbus is selected. Since there is no BR2_PACKAGE_LIBAVAHI_CLIENT config
-# option yet, use the avahi-daemon and dbus config symbols to check for
-# libavahi-client.
-ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy)
+ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y)
 LIBOSTREE_CONF_OPTS += --with-avahi
 LIBOSTREE_DEPENDENCIES += avahi
 else
diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk
index 604d08f90d..b05ce2bcc2 100644
--- a/package/pipewire/pipewire.mk
+++ b/package/pipewire/pipewire.mk
@@ -83,8 +83,7 @@ else
 PIPEWIRE_CONF_OPTS += -Dalsa=disabled -Dpipewire-alsa=disabled
 endif
 
-# avahi support needs avahi-client, which needs avahi-daemon and dbus
-ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy)
+ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y)
 PIPEWIRE_CONF_OPTS += -Davahi=enabled
 PIPEWIRE_DEPENDENCIES += avahi
 else
diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk
index cf49f2b2ed..487e0c05e5 100644
--- a/package/shairport-sync/shairport-sync.mk
+++ b/package/shairport-sync/shairport-sync.mk
@@ -22,11 +22,7 @@ SHAIRPORT_SYNC_CONF_OPTS = --with-alsa \
 SHAIRPORT_SYNC_CONF_ENV += LIBS="$(SHAIRPORT_SYNC_CONF_LIBS)"
 
 # Avahi or tinysvcmdns (shaiport-sync bundles its own version of tinysvcmdns).
-# Avahi support needs libavahi-client, which is built by avahi if avahi-daemon
-# and dbus is selected. Since there is no BR2_PACKAGE_LIBAVAHI_CLIENT config
-# option yet, use the avahi-daemon and dbus congig symbols to check for
-# libavahi-client.
-ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy)
+ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y)
 SHAIRPORT_SYNC_DEPENDENCIES += avahi
 SHAIRPORT_SYNC_CONF_OPTS += --with-avahi --without-tinysvcmdns
 else
diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk
index fe338fcbe8..b793e0efe0 100644
--- a/package/vlc/vlc.mk
+++ b/package/vlc/vlc.mk
@@ -117,8 +117,7 @@ else
 VLC_CONF_OPTS += --disable-alsa
 endif
 
-# avahi support needs avahi-client, which needs avahi-daemon and dbus
-ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy)
+ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y)
 VLC_CONF_OPTS += --enable-avahi
 VLC_DEPENDENCIES += avahi
 else
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
