summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrice Fontaine <fontaine.fabrice@gmail.com>2018-11-04 11:10:26 +0100
committerArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2018-11-07 00:13:18 +0100
commit7d7d57560c5fec9f8932a7084ac48e5d9e95d64d (patch)
tree05603f0113b31515f21dbc37e615295144fce5c5
parent72bafd5e458e2fe22178ae920e6323e7b8f71411 (diff)
downloadbuildroot-7d7d57560c5fec9f8932a7084ac48e5d9e95d64d.tar.gz
buildroot-7d7d57560c5fec9f8932a7084ac48e5d9e95d64d.zip
wireshark: add libxml2 optional dependency
Optional dependency to libxml2 has been added with version 2.4.0 and https://github.com/wireshark/wireshark/commit/cfab5ef035db7be8502623af203ab3494a9200e3 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 d2b3ec4e4e..a141ca3e2a 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -17,7 +17,6 @@ WIRESHARK_CONF_ENV = \
WIRESHARK_CONF_OPTS = \
--enable-static=no \
--without-bcg729 \
- --without-libxml2 \
--without-lz4 \
--without-nghttp2 \
--without-snappy \
@@ -96,6 +95,13 @@ else
WIRESHARK_CONF_OPTS += --without-libssh
endif
+ifeq ($(BR2_PACKAGE_LIBXML2),y)
+WIRESHARK_CONF_OPTS += --with-libxml2
+WIRESHARK_DEPENDENCIES += libxml2
+else
+WIRESHARK_CONF_OPTS += --without-libxml2
+endif
+
# no support for lua53 yet
ifeq ($(BR2_PACKAGE_LUA_5_1)$(BR2_PACKAGE_LUA_5_2),y)
WIRESHARK_CONF_OPTS += --with-lua
OpenPOWER on IntegriCloud