* [ptxdist] [PATCH] avahi: version bump 0.6.31 -> 0.7
@ 2017-07-20 12:56 Bastian Stender
2017-09-13 16:52 ` Bastian Stender
0 siblings, 1 reply; 2+ messages in thread
From: Bastian Stender @ 2017-07-20 12:56 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Stender
The "service-types" file is no longer installed.
Signed-off-by: Bastian Stender <bst@pengutronix.de>
---
rules/avahi.make | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/rules/avahi.make b/rules/avahi.make
index 2e796bce4..8621bf89f 100644
--- a/rules/avahi.make
+++ b/rules/avahi.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_AVAHI) += avahi
#
# Paths and names
#
-AVAHI_VERSION := 0.6.31
-AVAHI_MD5 := 2f22745b8f7368ad5a0a3fddac343f2d
+AVAHI_VERSION := 0.7
+AVAHI_MD5 := d76c59d0882ac6c256d70a2a585362a6
AVAHI := avahi-$(AVAHI_VERSION)
AVAHI_SUFFIX := tar.gz
AVAHI_URL := http://avahi.org/download/$(AVAHI).$(AVAHI_SUFFIX)
@@ -52,7 +52,7 @@ AVAHI_CONF_OPT := \
--disable-gdbm \
--enable-libdaemon \
--disable-python \
- --disable-pygtk \
+ --disable-pygobject \
--disable-python-dbus \
--disable-mono \
--disable-monodoc \
@@ -83,6 +83,10 @@ AVAHI_CONF_OPT := \
--with-autoipd-group=$(PTXCONF_AVAHI_AUTOIP_GROUP) \
--with-systemdsystemunitdir=/usr/lib/systemd/system
+# if PTXCONF_AVAHI_LIBAVAHI_CLIENT and PTXCONF_AVAHI_GTK are set:
+# warning: libavahi-glib.so.1, needed by ./.libs/libavahi-ui-gtk3.so, not found (try using -rpath or -rpath-link)
+AVAHI_LDFLAGS := -Wl,-rpath-link,$(AVAHI_DIR)/avahi-glib/.libs/
+
AVAHI_CFLAGS:= -D_FILE_OFFSET_BITS=64
# ----------------------------------------------------------------------------
@@ -99,8 +103,6 @@ $(STATEDIR)/avahi.targetinstall:
@$(call install_fixup, avahi,DESCRIPTION,missing)
@$(call install_copy, avahi, 0, 0, 0644, -, \
- /usr/share/avahi/service-types)
- @$(call install_copy, avahi, 0, 0, 0644, -, \
/usr/share/avahi/avahi-service.dtd)
# avahi core libs
--
2.11.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [PATCH] avahi: version bump 0.6.31 -> 0.7
2017-07-20 12:56 [ptxdist] [PATCH] avahi: version bump 0.6.31 -> 0.7 Bastian Stender
@ 2017-09-13 16:52 ` Bastian Stender
0 siblings, 0 replies; 2+ messages in thread
From: Bastian Stender @ 2017-09-13 16:52 UTC (permalink / raw)
To: ptxdist
On 07/20/2017 02:56 PM, Bastian Stender wrote:
> The "service-types" file is no longer installed.
>
> Signed-off-by: Bastian Stender <bst@pengutronix.de>
> ---
> rules/avahi.make | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/rules/avahi.make b/rules/avahi.make
> index 2e796bce4..8621bf89f 100644
> --- a/rules/avahi.make
> +++ b/rules/avahi.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_AVAHI) += avahi
> #
> # Paths and names
> #
> -AVAHI_VERSION := 0.6.31
> -AVAHI_MD5 := 2f22745b8f7368ad5a0a3fddac343f2d
> +AVAHI_VERSION := 0.7
> +AVAHI_MD5 := d76c59d0882ac6c256d70a2a585362a6
> AVAHI := avahi-$(AVAHI_VERSION)
> AVAHI_SUFFIX := tar.gz
> AVAHI_URL := http://avahi.org/download/$(AVAHI).$(AVAHI_SUFFIX)
> @@ -52,7 +52,7 @@ AVAHI_CONF_OPT := \
> --disable-gdbm \
> --enable-libdaemon \
> --disable-python \
> - --disable-pygtk \
> + --disable-pygobject \
> --disable-python-dbus \
> --disable-mono \
> --disable-monodoc \
> @@ -83,6 +83,10 @@ AVAHI_CONF_OPT := \
> --with-autoipd-group=$(PTXCONF_AVAHI_AUTOIP_GROUP) \
> --with-systemdsystemunitdir=/usr/lib/systemd/system
>
> +# if PTXCONF_AVAHI_LIBAVAHI_CLIENT and PTXCONF_AVAHI_GTK are set:
> +# warning: libavahi-glib.so.1, needed by ./.libs/libavahi-ui-gtk3.so, not found (try using -rpath or -rpath-link)
> +AVAHI_LDFLAGS := -Wl,-rpath-link,$(AVAHI_DIR)/avahi-glib/.libs/
> +
> AVAHI_CFLAGS:= -D_FILE_OFFSET_BITS=64
>
> # ----------------------------------------------------------------------------
> @@ -99,8 +103,6 @@ $(STATEDIR)/avahi.targetinstall:
> @$(call install_fixup, avahi,DESCRIPTION,missing)
>
> @$(call install_copy, avahi, 0, 0, 0644, -, \
> - /usr/share/avahi/service-types)
> - @$(call install_copy, avahi, 0, 0, 0644, -, \
> /usr/share/avahi/avahi-service.dtd)
>
> # avahi core libs
Any thoughts on this patch?
bst
--
Pengutronix e.K.
Industrial Linux Solutions
http://www.pengutronix.de/
Peiner Str. 6-8, 31137 Hildesheim, Germany
Amtsgericht Hildesheim, HRA 2686
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-09-13 16:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-20 12:56 [ptxdist] [PATCH] avahi: version bump 0.6.31 -> 0.7 Bastian Stender
2017-09-13 16:52 ` Bastian Stender
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox