avahi: fix dbus issue

Needs an extra configure parameter.

Reverted pkgconfig fix. It's wrong anyway.

Signed-off-by: Rosen Penev <redacted>

diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile
index 67aa0c804c9f2bc7fff2a07c565f122b38ea13b4..428493c56de44f6fcf4771144f48376a95842715 100644 (file)
--- a/libs/avahi/Makefile
+++ b/libs/avahi/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=avahi
 PKG_VERSION:=0.8
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/lathiat/avahi/releases/download/v$(PKG_VERSION) \
@@ -289,6 +289,7 @@ CONFIGURE_ARGS += \
        --with-distro=none \
        --with-avahi-user=nobody \
        --with-avahi-group=nogroup \
+       --with-avahi-priv-access-group=nogroup \
        --with-autoipd-user=nobody \
        --with-autoipd-group=nogroup
 
@@ -321,9 +322,11 @@ endif
        $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
        $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/avahi-core.pc
+ifeq ($(BUILD_VARIANT),dbus)
+ifneq ($(CONFIG_PACKAGE_libavahi-client),)
        $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/avahi-client.pc
+endif
 ifneq ($(CONFIG_PACKAGE_libavahi-compat-libdnssd),)
-ifeq ($(BUILD_VARIANT),dbus)
        $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/avahi-compat-libdns_sd.pc
 endif
 endif