From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 6/9] wireshark: gcrypt support is optional
Date: Wed, 2 Dec 2015 22:38:13 +0100 [thread overview]
Message-ID: <20151202213813.GF5773@free.fr> (raw)
In-Reply-To: <1449089301-29762-6-git-send-email-gustavo@zacarias.com.ar>
Gustavo, All,
On 2015-12-02 17:48 -0300, Gustavo Zacarias spake thusly:
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: "Yann E. MORIN" <yann.morin.1998@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. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2015-12-02 21:38 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-02 20:48 [Buildroot] [PATCH 1/9] wireshark: forcibly disable lua Gustavo Zacarias
2015-12-02 20:48 ` [Buildroot] [PATCH 2/9] wireshark: needs host-pkgconf Gustavo Zacarias
2015-12-02 20:58 ` Yann E. MORIN
2015-12-02 20:48 ` [Buildroot] [PATCH 3/9] wireshark: enable GUI options Gustavo Zacarias
2015-12-02 21:55 ` Yann E. MORIN
2015-12-02 22:21 ` Gustavo Zacarias
2015-12-02 20:48 ` [Buildroot] [PATCH 4/9] wireshark: add optional libnl suport Gustavo Zacarias
2015-12-02 21:02 ` Yann E. MORIN
2015-12-02 20:48 ` [Buildroot] [PATCH 5/9] wireshark: add optional c-ares support Gustavo Zacarias
2015-12-02 21:08 ` Yann E. MORIN
2015-12-02 20:48 ` [Buildroot] [PATCH 6/9] wireshark: gcrypt support is optional Gustavo Zacarias
2015-12-02 21:38 ` Yann E. MORIN [this message]
2015-12-02 20:48 ` [Buildroot] [PATCH 7/9] wireshark: add optional gnutls support Gustavo Zacarias
2015-12-02 21:43 ` Yann E. MORIN
2015-12-02 20:48 ` [Buildroot] [PATCH 8/9] wireshark: add optional geoip support Gustavo Zacarias
2015-12-02 21:52 ` Yann E. MORIN
2015-12-02 22:17 ` Gustavo Zacarias
2015-12-02 20:48 ` [Buildroot] [PATCH 9/9] wireshark: add optional sbc support Gustavo Zacarias
2015-12-02 20:56 ` Baruch Siach
2015-12-02 20:59 ` Gustavo Zacarias
2015-12-02 21:11 ` Yann E. MORIN
2015-12-16 22:50 ` Thomas Petazzoni
2015-12-02 20:57 ` [Buildroot] [PATCH 1/9] wireshark: forcibly disable lua Yann E. MORIN
2015-12-02 21:02 ` Gustavo Zacarias
2015-12-03 21:39 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151202213813.GF5773@free.fr \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox