summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabrice Fontaine <fontaine.fabrice@gmail.com>2018-11-04 10:10:30 (GMT)
committerArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2018-11-06 23:21:36 (GMT)
commit7cd1baf25be8688e829897430e256d3ec243be54 (patch)
tree3c39ae64b487b799b32e97907056bd4872f30252
parent1ac495038261cef5d110e0ffd96bdb87ea02fefe (diff)
downloadbuildroot-7cd1baf25be8688e829897430e256d3ec243be54.tar.gz
buildroot-7cd1baf25be8688e829897430e256d3ec243be54.tar.bz2
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 <fontaine.fabrice@gmail.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
-rw-r--r--package/wireshark/wireshark.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index f42dca1..2e41c3d 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