diff options
| author | Gerald Combs <gerald@wireshark.org> | 2019-11-22 11:16:36 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2019-11-23 22:45:59 +0000 |
| commit | 451a241e50bd34ba097bd09a5f9f673170779aaf (patch) | |
| tree | cd112515a1ddcd15fb73b1d124e7223d27b1988c /tools | |
| parent | 6a0b558ac1da13fffec560c1a522bafbe95517a1 (diff) | |
Add c-ares to the required library list.
Although c-ares support was techically optional, it was either on by
default or required in all of our packaging. Go ahead and require it
globally. C-ares is widely available and synchronous name resolution can
easily result in a horrific user experience.
Change-Id: Id67c797316ed6b8a0ab5052e55a43a1b9e2a2464
Reviewed-on: https://code.wireshark.org/review/35188
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/alpine-setup.sh | 2 | ||||
| -rwxr-xr-x | tools/bsd-setup.sh | 4 | ||||
| -rwxr-xr-x | tools/debian-setup.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/alpine-setup.sh b/tools/alpine-setup.sh index 5f4e48c450..898d96623f 100755 --- a/tools/alpine-setup.sh +++ b/tools/alpine-setup.sh @@ -50,6 +50,7 @@ BASIC_LIST="cmake \ bison \ perl \ tiff-dev \ + c-ares-dev \ qt5-qtbase-dev \ qt5-qttools-dev \ qt5-qtmultimedia-dev \ @@ -66,7 +67,6 @@ ADDITIONAL_LIST=" libxml2-dev \ libmaxminddb-dev \ krb5-dev \ - c-ares-dev \ lz4-dev \ gnutls-dev \ snappy-dev \ diff --git a/tools/bsd-setup.sh b/tools/bsd-setup.sh index 87d482da25..45c7014fe8 100755 --- a/tools/bsd-setup.sh +++ b/tools/bsd-setup.sh @@ -116,8 +116,8 @@ echo "pkg-config is unavailable" # c-ares: FreeBSD # libcares: OpenBSD -add_package ADDITIONAL_LIST c-ares || -add_package ADDITIONAL_LIST libcares || +add_package BASIC_LIST c-ares || +add_package BASIC_LIST libcares || echo "c-ares is unavailable" # rubygem-asciidoctor: FreeBSD diff --git a/tools/debian-setup.sh b/tools/debian-setup.sh index 2f3a3579e2..c57662ba26 100755 --- a/tools/debian-setup.sh +++ b/tools/debian-setup.sh @@ -56,6 +56,7 @@ BASIC_LIST="libglib2.0-dev \ libqt5svg5-dev \ qtmultimedia5-dev \ qt5-default \ + libc-ares-dev \ libpcap-dev \ bison \ flex \ @@ -65,7 +66,6 @@ BASIC_LIST="libglib2.0-dev \ libgcrypt-dev" ADDITIONAL_LIST="libnl-3-dev \ - libc-ares-dev \ libkrb5-dev \ libsmi2-dev \ asciidoctor \ |