From: Petr Vorel <petr.vorel@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] package/wireshark: bump to version 3.4.0
Date: Mon, 2 Nov 2020 20:53:22 +0100 [thread overview]
Message-ID: <20201102195322.GA37476@pevik> (raw)
In-Reply-To: <CAPi7W81js5YTDezCVv1XAJEUchYTEkRBkbQx8Ou6S7z2jO_A0g@mail.gmail.com>
Hi Fabrice,
> Le lun. 2 nov. 2020 ? 20:43, Petr Vorel <petr.vorel@gmail.com> a ?crit :
> > Actually, c-ares are required since v3.3.0
> > (commit 451a241e50 Add c-ares to the required library list.)
> > You still keep it as optional dependency, thus by default build fails.
> Thanks for spotting this mistake, I'll send a v2.
You know it better than me, but this fixed build for me.
Kind regards,
Petr
diff --git package/wireshark/Config.in package/wireshark/Config.in
index b26aa7a3df..95fc9b38f3 100644
--- package/wireshark/Config.in
+++ package/wireshark/Config.in
@@ -5,6 +5,7 @@ config BR2_PACKAGE_WIRESHARK
depends on BR2_USE_MMU # fork(), glib2
depends on BR2_USE_WCHAR # glib2
depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+ select BR2_PACKAGE_C_ARES
select BR2_PACKAGE_LIBPCAP
select BR2_PACKAGE_LIBGCRYPT
select BR2_PACKAGE_LIBGLIB2
diff --git package/wireshark/wireshark.mk package/wireshark/wireshark.mk
index 58262f2d2e..4dd2130bbc 100644
--- package/wireshark/wireshark.mk
+++ package/wireshark/wireshark.mk
@@ -9,8 +9,8 @@ WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz
WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions
WIRESHARK_LICENSE = wireshark license
WIRESHARK_LICENSE_FILES = COPYING
-WIRESHARK_DEPENDENCIES = host-pkgconf host-python3 libgcrypt libpcap libglib2 \
- speexdsp
+WIRESHARK_DEPENDENCIES = c-ares host-pkgconf host-python3 libgcrypt libpcap \
+ libglib2 speexdsp
WIRESHARK_MAKE_ENV = \
$(TARGET_MAKE_ENV) \
@@ -63,13 +63,6 @@ else
WIRESHARK_CONF_OPTS += -DENABLE_BROTLI=OFF
endif
-ifeq ($(BR2_PACKAGE_C_ARES),y)
-WIRESHARK_CONF_OPTS += -DENABLE_CARES=ON
-WIRESHARK_DEPENDENCIES += c-ares
-else
-WIRESHARK_CONF_OPTS += -DENABLE_CARES=OFF
-endif
-
ifeq ($(BR2_PACKAGE_GNUTLS),y)
WIRESHARK_CONF_OPTS += -DENABLE_GNUTLS=ON
WIRESHARK_DEPENDENCIES += gnutls
prev parent reply other threads:[~2020-11-02 19:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-01 16:30 [Buildroot] [PATCH 1/1] package/wireshark: bump to version 3.4.0 Fabrice Fontaine
2020-11-02 19:29 ` Petr Vorel
2020-11-02 19:43 ` Petr Vorel
2020-11-02 19:47 ` Fabrice Fontaine
2020-11-02 19:53 ` Petr Vorel [this message]
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=20201102195322.GA37476@pevik \
--to=petr.vorel@gmail.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.