qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Richard Henderson <richard.henderson@linaro.org>
Cc: "Max Fritz" <antischmock@googlemail.com>,
	"Daniel P . Berrangé" <berrange@redhat.com>
Subject: [PULL 07/18] Add conditional dependency for libkeyutils
Date: Tue,  6 Jun 2023 07:56:10 +0200	[thread overview]
Message-ID: <20230606055621.523175-8-thuth@redhat.com> (raw)
In-Reply-To: <20230606055621.523175-1-thuth@redhat.com>

From: Max Fritz <antischmock@googlemail.com>

This modification enables better control over the inclusion of libkeyutils
based on the configuration, enhancing the flexibility of the build system.

Signed-off-by: Max Fritz <antischmock@googlemail.com>
Message-Id: <168471463402.18155.3575359027429939965-1@git.sr.ht>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
[thuth: Remove the "kwargs: static_kwargs" part - it's not necessary anymore]
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 meson.build | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index a61d3e9b06..576bc2fdbd 100644
--- a/meson.build
+++ b/meson.build
@@ -1781,8 +1781,10 @@ if gnutls.found()
   tasn1 = dependency('libtasn1',
                      method: 'pkg-config')
 endif
-keyutils = dependency('libkeyutils', required: false,
-                      method: 'pkg-config')
+keyutils = not_found
+if get_option('keyring').enabled()
+  keyutils = dependency('libkeyutils', required: false, method: 'pkg-config')
+endif
 
 has_gettid = cc.has_function('gettid')
 
-- 
2.31.1



  parent reply	other threads:[~2023-06-06  5:58 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-06  5:56 [PULL 00/18] s390x and misc patches Thomas Huth
2023-06-06  5:56 ` [PULL 01/18] target/s390x: Fix LCBB overwriting the top 32 bits Thomas Huth
2023-06-06  5:56 ` [PULL 02/18] tests/tcg/s390x: Test LCBB Thomas Huth
2023-06-06  5:56 ` [PULL 03/18] target/s390x: Fix LOCFHR taking the wrong half of R2 Thomas Huth
2023-06-06  5:56 ` [PULL 04/18] tests/tcg/s390x: Test LOCFHR Thomas Huth
2023-06-06  5:56 ` [PULL 05/18] linux-user/s390x: Fix single-stepping SVC Thomas Huth
2023-06-06  5:56 ` [PULL 06/18] tests/tcg/s390x: Test " Thomas Huth
2023-06-06  5:56 ` Thomas Huth [this message]
2023-06-06  5:56 ` [PULL 08/18] target/s390x: Fix MXDB and MXDBR Thomas Huth
2023-06-06  5:56 ` [PULL 09/18] tests/tcg/s390x: Test " Thomas Huth
2023-06-06  5:56 ` [PULL 10/18] tests/qtest: Run ipmi-bt-test only if CONFIG_IPMI_EXTERN is set Thomas Huth
2023-06-06  5:56 ` [PULL 11/18] gitlab-ci: Remove unused Python package Thomas Huth
2023-06-06  5:56 ` [PULL 12/18] hw/mips/malta: Fix the malta machine on big endian hosts Thomas Huth
2023-06-06  5:56 ` [PULL 13/18] scripts: Add qom-cast-macro-clean-cocci-gen.py Thomas Huth
2023-06-06  5:56 ` [PULL 14/18] bulk: Remove pointless QOM casts Thomas Huth
2023-06-06  5:56 ` [PULL 15/18] s390x/tcg: Fix CPU address returned by STIDP Thomas Huth
2023-06-07  9:05   ` Michael Tokarev
2023-06-07  9:11     ` Ilya Leoshkevich
2023-06-06  5:56 ` [PULL 16/18] linux-user/elfload: Expose get_elf_hwcap() on s390x Thomas Huth
2023-06-06  5:56 ` [PULL 17/18] linux-user/elfload: Introduce elf_hwcap_str() " Thomas Huth
2023-06-06  5:56 ` [PULL 18/18] linux-user: Emulate /proc/cpuinfo " Thomas Huth
2023-06-06 15:46 ` [PULL 00/18] s390x and misc patches Richard Henderson

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=20230606055621.523175-8-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=antischmock@googlemail.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).