[Buildroot] [PATCH 6/9] wireshark: gcrypt support is optional
Yann E. MORIN
yann.morin.1998 at free.fr
Wed Dec 2 21:38:13 UTC 2015
Gustavo, All,
On 2015-12-02 17:48 -0300, Gustavo Zacarias spake thusly:
> Signed-off-by: Gustavo Zacarias <gustavo at zacarias.com.ar>
Acked-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
Regards,
Yann E. MORIN.
> ---
> package/wireshark/Config.in | 1 -
> package/wireshark/wireshark.mk | 11 +++++++++--
> 2 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in
> index f559c22..52b0f52 100644
> --- a/package/wireshark/Config.in
> +++ b/package/wireshark/Config.in
> @@ -1,7 +1,6 @@
> config BR2_PACKAGE_WIRESHARK
> bool "wireshark"
> select BR2_PACKAGE_LIBPCAP
> - select BR2_PACKAGE_LIBGCRYPT
> select BR2_PACKAGE_LIBGLIB2
> depends on BR2_USE_MMU # fork(), glib2
> depends on BR2_USE_WCHAR # glib2
> diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
> index 2940d26..cc9fb41 100644
> --- a/package/wireshark/wireshark.mk
> +++ b/package/wireshark/wireshark.mk
> @@ -9,9 +9,8 @@ WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2
> WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions
> WIRESHARK_LICENSE = wireshark license
> WIRESHARK_LICENSE_FILES = COPYING
> -WIRESHARK_DEPENDENCIES = host-pkgconf libpcap libgcrypt libglib2
> +WIRESHARK_DEPENDENCIES = host-pkgconf libpcap libglib2
> WIRESHARK_CONF_ENV = \
> - LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \
> ac_cv_path_PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config
>
> # patch touching configure.ac
> @@ -64,6 +63,14 @@ else
> WIREHARK_CONF_OPTS += --without-c-ares
> endif
>
> +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
> +WIRESHARK_CONF_ENV = LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
> +WIRESHARK_CONF_OPTS += --with-gcrypt=yes
> +WIRESHARK_DEPENDENCIES += libgcrypt
> +else
> +WIRESHARK_CONF_OPTS += --with-gcrypt=no
> +endif
> +
> ifeq ($(BR2_PACKAGE_LIBNL),y)
> WIRESHARK_CONF_OPTS += --with-libnl
> WIRESHARK_DEPENDENCIES += libnl
> --
> 2.4.10
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
More information about the buildroot
mailing list