[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/11] meson.build: fix libgcrypt detection on system without libg
From: |
Daniel P . Berrangé |
Subject: |
[PULL 05/11] meson.build: fix libgcrypt detection on system without libgcrypt-config |
Date: |
Wed, 24 Jul 2024 10:47:00 +0100 |
From: Yao Zi <ziyao@disroot.org>
libgcrypt starts providing correct pkg-config configuration since 1.9,
in parallel with libgcrypt-config. Since 1.11 it may also stop
installing libgcrypt-config in some scenarios. Use the auto method for
detection of libgcrypt, in which meson will try both pkg-config and
libgcrypt-config.
Auto method for libgcrypt is supported by meson since 0.49.0, which is
higher than the version qemu requires.
Signed-off-by: Yao Zi <ziyao@disroot.org>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
meson.build | 1 -
1 file changed, 1 deletion(-)
diff --git a/meson.build b/meson.build
index 4eca361319..ec6fb7d69c 100644
--- a/meson.build
+++ b/meson.build
@@ -1696,7 +1696,6 @@ endif
if not gnutls_crypto.found()
if (not get_option('gcrypt').auto() or have_system) and not
get_option('nettle').enabled()
gcrypt = dependency('libgcrypt', version: '>=1.8',
- method: 'config-tool',
required: get_option('gcrypt'))
# Debian has removed -lgpg-error from libgcrypt-config
# as it "spreads unnecessary dependencies" which in
--
2.45.2
- [PULL 00/11] Crypto patches, Daniel P . Berrangé, 2024/07/24
- [PULL 01/11] crypto: Remove 'crypto-tls-x509-helpers.h' from crypto-tls-psk-helpers.c, Daniel P . Berrangé, 2024/07/24
- [PULL 02/11] crypto: Restrict pkix_asn1_tab[] to crypto-tls-x509-helpers.c, Daniel P . Berrangé, 2024/07/24
- [PULL 04/11] docs/devel: Add introduction to LUKS volume with detached header, Daniel P . Berrangé, 2024/07/24
- [PULL 03/11] crypto: Allow building with GnuTLS but without Libtasn1, Daniel P . Berrangé, 2024/07/24
- [PULL 07/11] meson: build chardev trace files when have_block, Daniel P . Berrangé, 2024/07/24
- [PULL 09/11] crypto: drop gnutls debug logging support, Daniel P . Berrangé, 2024/07/24
- [PULL 06/11] qapi: drop unused QCryptoBlockCreateOptionsLUKS.detached-header, Daniel P . Berrangé, 2024/07/24
- [PULL 11/11] crypto: propagate errors from TLS session I/O callbacks, Daniel P . Berrangé, 2024/07/24
- [PULL 05/11] meson.build: fix libgcrypt detection on system without libgcrypt-config,
Daniel P . Berrangé <=
- [PULL 08/11] chardev: add tracing of socket error conditions, Daniel P . Berrangé, 2024/07/24
- [PULL 10/11] crypto: push error reporting into TLS session I/O APIs, Daniel P . Berrangé, 2024/07/24
- Re: [PULL 00/11] Crypto patches, Richard Henderson, 2024/07/24