diff mbox series

[05/18] crypto: fix gcrypt min version 1.8 regression

Message ID 20210706095924.764117-6-berrange@redhat.com
State New
Headers show
Series crypto: misc cleanup and introduce gnutls backend driver | expand

Commit Message

Daniel P. Berrangé July 6, 2021, 9:59 a.m. UTC
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

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Eric Blake July 8, 2021, 6:34 p.m. UTC | #1
On Tue, Jul 06, 2021 at 10:59:11AM +0100, Daniel P. Berrangé wrote:
> 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
> 
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>  meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Eric Blake <eblake@redhat.com>
diff mbox series

Patch

diff --git a/meson.build b/meson.build
index db6789af9c..945ae9c81d 100644
--- a/meson.build
+++ b/meson.build
@@ -834,7 +834,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)