From: Daniel P. Berrangé <berrange@redhat.com>
Date: Tue, 29 Jun 2021 16:08:28 +0000 (+0100)
Subject: crypto: fix gcrypt min version 1.8 regression
X-Git-Tag: v6.1.0-rc0~12^2~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1741093b0a782541b7508ca5ff26836f179e864b;p=thirdparty%2Fqemu.git

crypto: fix gcrypt min version 1.8 regression

The min gcrypt was bumped:

  commit b33a84632a3759c00320fd80923aa963c11207fc
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   Fri May 14 13:04:08 2021 +0100

    crypto: bump min gcrypt to 1.8.0, dropping RHEL-7 support

but this was accidentally lost in conflict resolution for

  commit 5761251138cb69c310e9df7dfc82c4c6fd2444e4
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   Thu Jun 3 11:15:26 2021 +0200

    configure, meson: convert crypto detection to meson

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/meson.build b/meson.build
index b0e2b9a8a08..e7de68d795f 100644
--- a/meson.build
+++ b/meson.build
@@ -839,7 +839,7 @@ elif (not get_option('nettle').auto() or have_system) and not get_option('gcrypt
   endif
 endif
 if (not get_option('gcrypt').auto() or have_system) and not nettle.found()
-  gcrypt = dependency('libgcrypt', version: '>=1.5',
+  gcrypt = dependency('libgcrypt', version: '>=1.8',
                          method: 'config-tool',
                          required: get_option('gcrypt'),
                          kwargs: static_kwargs)