qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Andrea Bolognani <abologna@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
	"Daniel P. Berrangé" <berrange@redhat.com>
Subject: [PATCH 1/3] meson: Don't force use of libgcrypt-config
Date: Wed, 19 Jan 2022 18:17:58 +0100	[thread overview]
Message-ID: <20220119171800.491703-2-abologna@redhat.com> (raw)
In-Reply-To: <20220119171800.491703-1-abologna@redhat.com>

libgcrypt 1.9.0 (released in 2021-01) ships with a proper
pkg-config file, which Meson's libgcrypt detection code can use
if available.

Passing 'config-tool' as 'method' when calling dependency(),
however, forces Meson to ignore the pkg-config file and always
use libgcrypt-config instead.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 meson.build | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meson.build b/meson.build
index 762d7cee85..bc17ba67fd 100644
--- a/meson.build
+++ b/meson.build
@@ -1036,7 +1036,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'),
                         kwargs: static_kwargs)
     # Debian has removed -lgpg-error from libgcrypt-config
-- 
2.34.1



  reply	other threads:[~2022-01-19 17:42 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-19 17:17 [PATCH 0/3] meson: Don't pass 'method' to dependency() Andrea Bolognani
2022-01-19 17:17 ` Andrea Bolognani [this message]
2022-01-19 17:17 ` [PATCH 2/3] " Andrea Bolognani
2022-01-19 17:18 ` [PATCH 3/3] docs: Don't recommend passing " Andrea Bolognani
2022-01-19 17:38 ` [PATCH 0/3] meson: Don't pass " Daniel P. Berrangé
2022-01-19 17:45   ` Andrea Bolognani

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=20220119171800.491703-2-abologna@redhat.com \
    --to=abologna@redhat.com \
    --cc=berrange@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /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).