On 14/05/2021 14.04, Daniel P. Berrangé wrote:
It has been over two years since RHEL-8 was released, and thus per the platform build policy, we no longer need to support RHEL-7 as a build target. This lets us increment the minimum required gnutls versionPer repology, current shipping versions are: RHEL-8: 3.6.14 Debian Buster: 3.6.7 openSUSE Leap 15.2: 3.6.7 Ubuntu LTS 18.04: 3.5.18 Ubuntu LTS 20.04: 3.6.13 FreeBSD: 3.6.15 Fedora 33: 3.6.16 Fedora 34: 3.7.1 OpenBSD: 3.6.15 macOS HomeBrew: 3.6.15 Ubuntu LTS 18.04 has the oldest version and so 3.5.18 is the new minimum. Signed-off-by: Daniel P. Berrangé <[email protected]> --- .gitlab-ci.yml | 15 --------------- configure | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f44c5b08ef..f386f445d9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -703,21 +703,6 @@ build-coroutine-sigaltstack: --enable-trace-backends=ftrace MAKE_CHECK_ARGS: check-unit-# Most jobs test latest gcrypt or nettle builds-# -# These jobs test old gcrypt and nettle from RHEL7 -# which had some API differences. -crypto-only-gnutls: - <<: *native_build_job_definition - needs: - job: amd64-centos7-container - variables: - IMAGE: centos7 - TARGETS: x86_64-softmmu x86_64-linux-user - CONFIGURE_ARGS: --disable-nettle --disable-gcrypt --enable-gnutls - MAKE_CHECK_ARGS: check - - # Check our reduced build configurations build-without-default-devices: <<: *native_build_job_definition diff --git a/configure b/configure index f077cdb9c3..2fa86ccaa1 100755 --- a/configure +++ b/configure @@ -2790,7 +2790,7 @@ fiif test "$gnutls" != "no"; thenpass="no" - if $pkg_config --exists "gnutls >= 3.1.18"; then + if $pkg_config --exists "gnutls >= 3.5.18"; then gnutls_cflags=$($pkg_config --cflags gnutls) gnutls_libs=$($pkg_config --libs gnutls) # Packaging for the static libraries is not always correct.
Reviewed-by: Thomas Huth <[email protected]>
