qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Yao Zi <ziyao@disroot.org>
To: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>
Cc: qemu-devel@nongnu.org, Yao Zi <ziyao@disroot.org>
Subject: [PATCH] meson.build: fix libgcrypt detection on system without libgcrypt-config
Date: Sat,  6 Jul 2024 20:12:26 +0000	[thread overview]
Message-ID: <20240706201226.46089-1-ziyao@disroot.org> (raw)

libgcrypt starts providing correct pkg-config configuration and dropping
libgcrypt-config since 1.11.0. So use auto method for detection of
libgcrypt, in which meson will try both pkg-config and libgcrypt-config.

This fixes build failure when libgcrypt is enabled on a system without
ligcrypt-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>
---
 meson.build | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meson.build b/meson.build
index 6a93da48e1..1b71824548 100644
--- a/meson.build
+++ b/meson.build
@@ -1695,7 +1695,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



             reply	other threads:[~2024-07-06 20:28 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-06 20:12 Yao Zi [this message]
2024-07-12 13:52 ` [PATCH] meson.build: fix libgcrypt detection on system without libgcrypt-config Daniel P. Berrangé
2024-07-15 13:21   ` Yao Zi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240706201226.46089-1-ziyao@disroot.org \
    --to=ziyao@disroot.org \
    --cc=berrange@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).