OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Fix for gnutls-crypto detection

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmEQ+MQUHHBib256aW5p
 QHJlZGhhdC5jb20ACgkQv/vSX3jHroMdtQf+NRP8oZyq1jTMIXqG7m8oChEl5FVE
 mEGYjRaTlspt48qlybwIXtGGnKf9EgHDuUY/buYL6lbrBB8SCbSawXNYZWHafbcZ
 nv9fce0hvVqyzz/82AeJblHODd/1WXog1ZU/YiJEZj+1h86a4B8GZTWpwJfBhDZG
 0AYVHxBLpnp5/Rg1WCkrhKihiJWEJKEgqwDkAL0FAcKrdhzncR1iF2U4ZPdVmEl7
 XHkqYM/dIMn1MkljNSH7A5ZHxN5b704U+g4YAXkh1oN4HNKGrEJU/gbnmJ/4tGPG
 jqADsHxhiRA/Jm8OMpwfOdl60ZN8IZ+ricTKA2yjTNyDNNQyp6cxNdd5Xg==
 =ZOOe
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging

Fix for gnutls-crypto detection

# gpg: Signature made Mon 09 Aug 2021 10:43:32 BST
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini-gitlab/tags/for-upstream:
  meson: fix logic for gnutls check

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2021-08-09 11:04:27 +01:00
commit 632eda5404
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -824,7 +824,7 @@ endif
gnutls = not_found
gnutls_crypto = not_found
if not get_option('gnutls').auto() or have_system
if get_option('gnutls').enabled() or (get_option('gnutls').auto() and have_system)
# For general TLS support our min gnutls matches
# that implied by our platform support matrix
#