From: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: Thu, 2 May 2024 09:56:42 +0000 (+0200)
Subject: crypto: Allow building with GnuTLS but without Libtasn1
X-Git-Tag: v9.1.0-rc0~11^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc37d1c56b87c6f4bc354d07791c9e69549e1524;p=thirdparty%2Fqemu.git

crypto: Allow building with GnuTLS but without Libtasn1

We only use Libtasn1 in unit tests. As noted in commit d47b83b118
("tests: add migration tests of TLS with x509 credentials"), having
GnuTLS without Libtasn1 is a valid configuration, so do not require
Libtasn1, to avoid:

  Dependency gnutls found: YES 3.7.1 (cached)
  Run-time dependency libtasn1 found: NO (tried pkgconfig)

  ../meson.build:1914:10: ERROR: Dependency "libtasn1" not found, tried pkgconfig

Fixes: ba7ed407e6 ("configure, meson: convert libtasn1 detection to meson")
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/meson.build b/meson.build
index af9f0380e26..4eca3613197 100644
--- a/meson.build
+++ b/meson.build
@@ -1979,6 +1979,7 @@ endif
 tasn1 = not_found
 if gnutls.found()
   tasn1 = dependency('libtasn1',
+                     required: false,
                      method: 'pkg-config')
 endif
 keyutils = not_found