From: Daniel P. Berrangé <berra...@redhat.com>
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 version
Per 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é <berra...@redhat.com>
Message-Id: <20210514120415.1368922-7-berra...@redhat.com>
Reviewed-by: Thomas Huth <th...@redhat.com>
Reviewed-by: Willian Rampazzo <willi...@redhat.com>
[thuth: rebased to use .gitlab-ci.d/buildtest.yml]
Signed-off-by: Thomas Huth <th...@redhat.com>
---
.gitlab-ci.d/buildtest.yml | 15 ---------------
configure | 2 +-
2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index fe44a5c2be..b72c57e4df 100644
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@@ -626,21 +626,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:
- extends: .native_build_job_template
- 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:
extends: .native_build_job_template
diff --git a/configure b/configure
index fb8c5187e8..b36df40c27 100755
--- a/configure
+++ b/configure
@@ -2801,7 +2801,7 @@ fi
if test "$gnutls" != "no"; then
pass="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.
--
2.27.0
