aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorDaniel P. Berrangé <berrange@redhat.com>2021-05-14 13:04:06 +0100
committerThomas Huth <thuth@redhat.com>2021-06-02 07:03:25 +0200
commit20ba7a4a34bc96fb53ce1fb837d280339c6f5671 (patch)
treea2f52c463e2286fa4b97cdedcfd7ed86d55d6ac0 /configure
parentf4d4be8212b946abfd438c046378240499bb8358 (diff)
downloadqemu-20ba7a4a34bc96fb53ce1fb837d280339c6f5671.zip
qemu-20ba7a4a34bc96fb53ce1fb837d280339c6f5671.tar.gz
qemu-20ba7a4a34bc96fb53ce1fb837d280339c6f5671.tar.bz2
crypto: bump min nettle to 3.4, dropping RHEL-7 support
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 nettle version and drop a lot of backwards compatibility code for 2.x series of nettle. Per repology, current shipping versions are: RHEL-8: 3.4.1 Debian Buster: 3.4.1 openSUSE Leap 15.2: 3.4.1 Ubuntu LTS 18.04: 3.4 Ubuntu LTS 20.04: 3.5.1 FreeBSD: 3.7.2 Fedora 33: 3.5.1 Fedora 34: 3.7.2 OpenBSD: 3.7.2 macOS HomeBrew: 3.7.2 Ubuntu LTS 18.04 has the oldest version and so 3.4 is the new minimum. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Message-Id: <20210514120415.1368922-4-berrange@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Willian Rampazzo <willianr@redhat.com> [thuth: rebased to use .gitlab-ci.d/buildtest.yml] Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 1 insertions, 3 deletions
diff --git a/configure b/configure
index ae629a3..fddda94 100755
--- a/configure
+++ b/configure
@@ -2871,10 +2871,9 @@ has_libgcrypt() {
if test "$nettle" != "no"; then
pass="no"
- if $pkg_config --exists "nettle >= 2.7.1"; then
+ if $pkg_config --exists "nettle >= 3.4"; then
nettle_cflags=$($pkg_config --cflags nettle)
nettle_libs=$($pkg_config --libs nettle)
- nettle_version=$($pkg_config --modversion nettle)
# Link test to make sure the given libraries work (e.g for static).
write_c_skeleton
if compile_prog "" "$nettle_libs" ; then
@@ -5730,7 +5729,6 @@ if test "$gcrypt" = "yes" ; then
fi
if test "$nettle" = "yes" ; then
echo "CONFIG_NETTLE=y" >> $config_host_mak
- echo "CONFIG_NETTLE_VERSION_MAJOR=${nettle_version%%.*}" >> $config_host_mak
echo "NETTLE_CFLAGS=$nettle_cflags" >> $config_host_mak
echo "NETTLE_LIBS=$nettle_libs" >> $config_host_mak
fi