[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/18] Add conditional dependency for libkeyutils
From: |
Thomas Huth |
Subject: |
[PULL 07/18] Add conditional dependency for libkeyutils |
Date: |
Tue, 6 Jun 2023 07:56:10 +0200 |
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
- [PULL 00/18] s390x and misc patches, Thomas Huth, 2023/06/06
- [PULL 01/18] target/s390x: Fix LCBB overwriting the top 32 bits, Thomas Huth, 2023/06/06
- [PULL 02/18] tests/tcg/s390x: Test LCBB, Thomas Huth, 2023/06/06
- [PULL 03/18] target/s390x: Fix LOCFHR taking the wrong half of R2, Thomas Huth, 2023/06/06
- [PULL 04/18] tests/tcg/s390x: Test LOCFHR, Thomas Huth, 2023/06/06
- [PULL 05/18] linux-user/s390x: Fix single-stepping SVC, Thomas Huth, 2023/06/06
- [PULL 07/18] Add conditional dependency for libkeyutils,
Thomas Huth <=
- [PULL 06/18] tests/tcg/s390x: Test single-stepping SVC, Thomas Huth, 2023/06/06
- [PULL 08/18] target/s390x: Fix MXDB and MXDBR, Thomas Huth, 2023/06/06
- [PULL 10/18] tests/qtest: Run ipmi-bt-test only if CONFIG_IPMI_EXTERN is set, Thomas Huth, 2023/06/06
- [PULL 11/18] gitlab-ci: Remove unused Python package, Thomas Huth, 2023/06/06
- [PULL 09/18] tests/tcg/s390x: Test MXDB and MXDBR, Thomas Huth, 2023/06/06
- [PULL 13/18] scripts: Add qom-cast-macro-clean-cocci-gen.py, Thomas Huth, 2023/06/06
- [PULL 12/18] hw/mips/malta: Fix the malta machine on big endian hosts, Thomas Huth, 2023/06/06
- [PULL 14/18] bulk: Remove pointless QOM casts, Thomas Huth, 2023/06/06
- [PULL 15/18] s390x/tcg: Fix CPU address returned by STIDP, Thomas Huth, 2023/06/06