From: Fabrice Fontaine Date: Sun, 4 Nov 2018 10:10:30 +0000 (+0100) Subject: wireshark: add snappy optional dependency X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7cd1baf25be8688e829897430e256d3ec243be54;p=buildroot.git wireshark: add snappy optional dependency - Optional dependency to snappy has been added with version 2.4.0 and https://github.com/wireshark/wireshark/commit/47649d1c7fb6ba48b805e19268a711404eb6908b - Specify the path to found libssh as this is done for other options Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index f42dca1c86..2e41c3d652 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -16,7 +16,6 @@ WIRESHARK_CONF_ENV = \ WIRESHARK_CONF_OPTS = \ --enable-static=no \ - --without-snappy \ --with-libsmi=no \ --with-pcap=$(STAGING_DIR)/usr @@ -135,6 +134,13 @@ else WIRESHARK_CONF_OPTS += --with-sbc=no endif +ifeq ($(BR2_PACKAGE_SNAPPY),y) +WIRESHARK_CONF_OPTS += --with-snappy=$(STAGING_DIR)/usr +WIRESHARK_DEPENDENCIES += snappy +else +WIRESHARK_CONF_OPTS += --without-snappy +endif + define WIRESHARK_REMOVE_DOCS find $(TARGET_DIR)/usr/share/wireshark -name '*.txt' -print0 \ -o -name '*.html' -print0 | xargs -0 rm -f