lib: drop support for < c-ares 1.16.0

Closes #20911
This commit is contained in:
Daniel Stenberg 2026-03-21 14:15:53 +01:00
parent 21fc17b265
commit 789282cb8d
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
6 changed files with 30 additions and 270 deletions

View file

@ -69,7 +69,7 @@ jobs:
sha256sum freexian-archive-keyring_2022.06.08_all.deb && dpkg -i freexian-archive-keyring_2022.06.08_all.deb
echo 'deb http://deb.freexian.com/extended-lts stretch-lts main contrib non-free' | tee /etc/apt/sources.list.d/extended-lts.list
apt-get -o Dpkg::Use-Pty=0 update
apt-get -o Dpkg::Use-Pty=0 install -y --no-install-suggests --no-install-recommends make automake autoconf libtool ninja-build gcc pkg-config libpsl-dev libzstd-dev zlib1g-dev libc-ares-dev libkrb5-dev libldap2-dev stunnel4
apt-get -o Dpkg::Use-Pty=0 install -y --no-install-suggests --no-install-recommends make automake autoconf libtool ninja-build gcc pkg-config libpsl-dev libzstd-dev zlib1g-dev libkrb5-dev libldap2-dev stunnel4
# GitHub's actions/checkout needs newer glibc and libstdc++. The latter also depends on
# gcc-8-base, but it does not actually seem used in our situation and is not available in
# the main repo, so force the install.
@ -116,49 +116,52 @@ jobs:
# when this job can get a libssh version 0.9.0 or later, this should get
# that enabled again
- name: 'CM configure (out-of-tree, c-ares, zstd, gssapi)'
# when this job can get c-ares 1.16.0 or later, we can enable that
# again
- name: 'CM configure (out-of-tree, zstd, gssapi)'
run: |
~/cmake/bin/cmake -B bld-cares -G Ninja -DCMAKE_UNITY_BUILD=ON -DCURL_WERROR=ON -DBUILD_SHARED_LIBS=ON \
-DCURL_ENABLE_SSL=OFF -DENABLE_ARES=ON -DCURL_USE_GSSAPI=ON -DCURL_USE_LIBSSH2=OFF -DCURL_USE_LIBSSH=OFF \
~/cmake/bin/cmake -B bld-oldie -G Ninja -DCMAKE_UNITY_BUILD=ON -DCURL_WERROR=ON -DBUILD_SHARED_LIBS=ON \
-DCURL_ENABLE_SSL=OFF -DENABLE_ARES=OFF -DCURL_USE_GSSAPI=ON -DCURL_USE_LIBSSH2=OFF -DCURL_USE_LIBSSH=OFF \
-DCURL_LIBCURL_VERSIONED_SYMBOLS=ON
- name: 'CM configure log'
if: ${{ !cancelled() }}
run: cat bld-cares/CMakeFiles/CMake*.log 2>/dev/null || true
run: cat bld-oldie/CMakeFiles/CMake*.log 2>/dev/null || true
- name: 'CM curl_config.h'
run: |
echo '::group::raw'; cat bld-cares/lib/curl_config.h || true; echo '::endgroup::'
grep -F '#define' bld-cares/lib/curl_config.h | sort || true
echo '::group::raw'; cat bld-oldie/lib/curl_config.h || true; echo '::endgroup::'
grep -F '#define' bld-oldie/lib/curl_config.h | sort || true
- name: 'CM build'
run: ~/cmake/bin/cmake --build bld-cares
run: ~/cmake/bin/cmake --build bld-oldie
- name: 'CM curl -V'
run: bld-cares/src/curl --disable --version
run: bld-oldie/src/curl --disable --version
- name: 'CM install'
run: ~/cmake/bin/cmake --install bld-cares
run: ~/cmake/bin/cmake --install bld-oldie
- name: 'CM build tests'
run: ~/cmake/bin/cmake --build bld-cares --target testdeps
run: ~/cmake/bin/cmake --build bld-oldie --target testdeps
- name: 'CM run tests'
run: ~/cmake/bin/cmake --build bld-cares --target test-ci
run: ~/cmake/bin/cmake --build bld-oldie --target test-ci
- name: 'CM build examples'
run: ~/cmake/bin/cmake --build bld-cares --target curl-examples-build
run: ~/cmake/bin/cmake --build bld-oldie --target curl-examples-build
- name: 'AM autoreconf'
run: autoreconf -fi
- name: 'AM configure (out-of-tree, c-ares, zstd, gssapi)'
- name: 'AM configure (out-of-tree, zstd, gssapi)'
run: |
mkdir bld-am
cd bld-am
../configure --prefix="$PWD"/../curl-install-am --enable-unity --enable-warnings --enable-werror --disable-shared \
--disable-dependency-tracking --enable-option-checking=fatal \
--without-ssl --enable-ares --without-libssh2 --with-zstd --with-gssapi
--without-ssl --disable-ares --without-libssh2 --with-zstd --with-gssapi
- name: 'AM configure log'
if: ${{ !cancelled() }}