summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Folkesson <marcus.folkesson@gmail.com>2017-12-22 00:19:32 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-12-28 22:55:42 +0100
commitcbe63bab24b8e8d0dcc7a2bf894a3a848fc5b4df (patch)
tree305118c184541f97069e1e621b7f60e849e41ef0
parent1d8de10c5fb36619708898a529977058886f31d1 (diff)
downloadbuildroot-cbe63bab24b8e8d0dcc7a2bf894a3a848fc5b4df.tar.gz
buildroot-cbe63bab24b8e8d0dcc7a2bf894a3a848fc5b4df.zip
libostree: make sure libavahi-client is built
Avahi support also needs libavahi-client, which is built by avahi if avahi-daemon and dbus is selected. Fixes: http://autobuild.buildroot.net/results/1edfb60add17945eabc557e1dbfb08a0ba466df9/ Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com> Tested-by: Matt Weber <matthew.weber@rockwellcollins.com> [Thomas: drop dependency on dbus, since libostree only needs avahi.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/libostree/libostree.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk
index 612c284870..26f173c1ba 100644
--- a/package/libostree/libostree.mk
+++ b/package/libostree/libostree.mk
@@ -27,7 +27,11 @@ else
LIBOSTREE_CONF_OPTS += --without-openssl
endif
-ifeq ($(BR2_PACKAGE_AVAHI),y)
+# Avahi support needs libavahi-client, which is built by avahi if avahi-daemon
+# and dbus is selected. Since there is no BR2_PACKAGE_LIBAVAHI_CLIENT config
+# option yet, use the avahi-daemon and dbus config symbols to check for
+# libavahi-client.
+ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy)
LIBOSTREE_CONF_OPTS += --with-avahi
LIBOSTREE_DEPENDENCIES += avahi
else
OpenPOWER on IntegriCloud