Message ID | 1456066125-28379-6-git-send-email-bernd.kuhls@t-online.de |
---|---|
State | Changes Requested |
Headers | show |
Dear Bernd Kuhls, On Sun, 21 Feb 2016 15:48:44 +0100, Bernd Kuhls wrote: > diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk > index 5d6e6a8..ce89e42 100644 > --- a/package/avahi/avahi.mk > +++ b/package/avahi/avahi.mk > @@ -117,6 +117,9 @@ endif > > ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y) > AVAHI_DEPENDENCIES += expat > +ifeq ($(BR2_PACKAGE_LIBCAP),y) > +AVAHI_DEPENDENCIES += libcap > +endif It is a bit weird to have this in the middle of the expat handling, IMO. > AVAHI_CONF_OPTS += --with-xml=expat > else > AVAHI_CONF_OPTS += --with-xml=none Shouldn't we simply do: ifeq ($(BR2_PACKAGE_EXPAT),y) AVAHI_DEPENDENCIES += expat AVAHI_CONF_OPTS += --with-xml=expat else AVAHI_CONF_OPTS += --with-xml=none endif ifeq ($(BR2_PACKAGE_LIBCAP),y) AVAHI_DEPENDENCIES += libcap endif Thomas
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 5d6e6a8..ce89e42 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -117,6 +117,9 @@ endif ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y) AVAHI_DEPENDENCIES += expat +ifeq ($(BR2_PACKAGE_LIBCAP),y) +AVAHI_DEPENDENCIES += libcap +endif AVAHI_CONF_OPTS += --with-xml=expat else AVAHI_CONF_OPTS += --with-xml=none
When libcap was compiled before, avahi will use it as optional dependency: $ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/sbin/avahi-daemon | grep NEEDED | sort 0x0000000000000001 (NEEDED) Shared library: [libavahi-common.so.3] 0x0000000000000001 (NEEDED) Shared library: [libavahi-core.so.7] 0x0000000000000001 (NEEDED) Shared library: [libcap.so.2] [...] The build system offers no option to en-/disable libcap support: http://git.0pointer.net/avahi.git/tree/configure.ac#n382 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- package/avahi/avahi.mk | 3 +++ 1 file changed, 3 insertions(+)