summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-07-19 16:00:51 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2010-07-19 16:01:28 +0200
commit4e302ac83d89fd370cab96ffa30ad406dd104ec0 (patch)
tree4f5ceba573c4f895a3816f08d86f747bc081d7fc
parentfbc22ecaef7b3422b8e74e50832b210577d8898f (diff)
avahi: bump version
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES2
-rw-r--r--package/avahi/avahi-disable-systemd-support.patch22
-rw-r--r--package/avahi/avahi.mk4
3 files changed, 26 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index f30da84b0..59b4a6fd8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,7 +14,7 @@
New packages: cgilua, copas, coxpcall, ffmpeg, libsvgtiny,
luafilesystem, luasocket, rings, wsapi, xavante, xterm
- Updated/fixed packages: alsa-lib, berkeleydb, bash, blackbox,
+ Updated/fixed packages: alsa-lib, avahi, berkeleydb, bash, blackbox,
busybox, bzip2, cdrkit, cmake, dash, dhcp, dialog, diffutils,
distcc, dmalloc, dnsmasq, dropbear, e2fsprogs, fbv, file, flex,
fontconfig, gawk, gstreamer, gzip, intltool, ipsec-tools,
diff --git a/package/avahi/avahi-disable-systemd-support.patch b/package/avahi/avahi-disable-systemd-support.patch
new file mode 100644
index 000000000..909795ade
--- /dev/null
+++ b/package/avahi/avahi-disable-systemd-support.patch
@@ -0,0 +1,22 @@
+[PATCH] avahi-daemon: disable systemd support
+
+Disable systemd support as it isn't needed for BR, and uses SOCK_CLOEXEC
+which isn't available on uClibc.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ avahi-daemon/sd-daemon.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+Index: avahi-0.6.27/avahi-daemon/sd-daemon.h
+===================================================================
+--- avahi-0.6.27.orig/avahi-daemon/sd-daemon.h
++++ avahi-0.6.27/avahi-daemon/sd-daemon.h
+@@ -66,6 +66,7 @@ extern "C" {
+
+ See sd-daemon(7) for more information.
+ */
++#define DISABLE_SYSTEMD /* no systemd support in BR */
+
+ #if __GNUC__ >= 4
+ #define _sd_printf_attr_(a,b) __attribute__ ((format (printf, a, b)))
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 66e2e6325..fa05de3d4 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -10,9 +10,10 @@
# either version 2.1 of the License, or (at your option) any
# later version.
-AVAHI_VERSION = 0.6.23
+AVAHI_VERSION = 0.6.27
AVAHI_SOURCE = avahi-$(AVAHI_VERSION).tar.gz
AVAHI_SITE = http://www.avahi.org/download/
+AVAHI_LIBTOOL_PATCH = NO
AVAHI_INSTALL_STAGING = YES
AVAHI_INSTALL_TARGET = YES
@@ -71,6 +72,7 @@ AVAHI_CONF_OPT = --localstatedir=/var \
--disable-gdbm \
--disable-python-dbus \
--disable-pygtk \
+ --disable-gtk3 \
--disable-mono \
--disable-monodoc \
--disable-stack-protector \