avahi: update to 0.8

Clean up Makefile slightly.

Update configure options for the new version.

Remove first patch and update the other one.

Use a different solution for the stack protector on certain platforms.

Run script through shellcheck. Small quote fix.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit 9290d41077)
This commit is contained in:
Rosen Penev
2020-02-25 19:31:34 -08:00
parent 0da04e56db
commit 7fba38e3f6
4 changed files with 18 additions and 125 deletions
+12 -16
View File
@@ -8,23 +8,19 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=avahi
PKG_VERSION:=0.7
PKG_RELEASE:=5
PKG_VERSION:=0.8
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/lathiat/avahi/releases/download/v$(PKG_VERSION) \
https://avahi.org/download
PKG_HASH:=57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
PKG_HASH:=060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=LICENSE
PKG_CPE_ID:=cpe:/a:avahi:avahi
PKG_BUILD_DEPENDS:=intltool/host
PKG_FIXUP:=autoreconf
PKG_REMOVE_FILES:=autogen.sh
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
@@ -255,22 +251,24 @@ $(call Package/avahi/Default/description)
endef
TARGET_CFLAGS += $(FPIC) -DGETTEXT_PACKAGE
TARGET_LDFLAGS += $(if $(CONFIG_SSP_SUPPORT),-lssp_nonshared)
CONFIGURE_ARGS+= \
CONFIGURE_ARGS += \
--enable-shared \
--enable-static \
--disable-glib \
--disable-gobject \
--disable-introspection \
--disable-qt3 \
--disable-qt4 \
--disable-qt5 \
--disable-gtk \
--disable-gtk3 \
--with-xml=expat \
--disable-dbm \
--enable-gdbm \
--enable-libdaemon \
--disable-libevent \
--disable-python \
--disable-pygtk \
--disable-python-dbus \
--disable-mono \
--disable-monodoc \
@@ -284,18 +282,16 @@ CONFIGURE_ARGS+= \
--disable-doxygen-html \
--disable-doxygen-ps \
--disable-doxygen-pdf \
--disable-manpages \
--disable-xmltoman \
--disable-tests \
--with-xml=expat \
--with-distro=none \
--with-avahi-user=nobody \
--with-avahi-group=nogroup \
--with-autoipd-user=nobody \
--with-autoipd-group=nogroup
ifneq ($(CONFIG_SSP_SUPPORT),y)
CONFIGURE_ARGS+= \
--disable-stack-protector
endif
ifeq ($(BUILD_VARIANT),dbus)
ifneq ($(CONFIG_PACKAGE_libavahi-compat-libdnssd),)
CONFIGURE_ARGS += \
@@ -310,7 +306,7 @@ endif
CONFIGURE_VARS+= \
CFLAGS="$$$$CFLAGS -DNDEBUG -DDISABLE_SYSTEMD" \
ac_cv_header_sys_capability_h=no \
ac_cv_header_sys_capability_h=no
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include