summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrice Fontaine <fontaine.fabrice@gmail.com>2018-11-04 11:10:28 +0100
committerArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2018-11-07 00:14:04 +0100
commit55ae4bc4d3deb051a65785d6bac15c250912a34a (patch)
tree2d38b13643b7d5c7e0e429ec6cec03c29e4de42f
parentc859af7c83f9a9e8d88bfd6ee5a3c39203696298 (diff)
downloadbuildroot-55ae4bc4d3deb051a65785d6bac15c250912a34a.tar.gz
buildroot-55ae4bc4d3deb051a65785d6bac15c250912a34a.zip
wireshark: add bcg729 optional dependency
- Optional dependency to bcg729 has been added with version 2.5.0 and https://github.com/wireshark/wireshark/commit/3e54cabf8193e6a8cd607b1671defb8b6800b53d - Specify the path to found bcg729 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 39a3060149..96cc15d185 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-bcg729 \
--without-lz4 \
--without-snappy \
--with-libsmi=no \
@@ -52,6 +51,13 @@ ifeq ($(BR2_PACKAGE_WIRESHARK_GUI),)
WIRESHARK_CONF_OPTS += --disable-wireshark
endif
+ifeq ($(BR2_PACKAGE_BCG729),y)
+WIRESHARK_CONF_OPTS += --with-bcg729=$(STAGING_DIR)/usr
+WIRESHARK_DEPENDENCIES += bcg729
+else
+WIRESHARK_CONF_OPTS += --without-bcg729
+endif
+
ifeq ($(BR2_PACKAGE_C_ARES),y)
WIRESHARK_CONF_OPTS += --with-c-ares=$(STAGING_DIR)/usr
WIRESHARK_DEPENDENCIES += c-ares
OpenPOWER on IntegriCloud