]> git.ipfire.org Git - thirdparty/qemu.git/commit
meson.build: Make keyutils independent from keyring
authorThomas Huth <thuth@redhat.com>
Thu, 24 Aug 2023 09:42:08 +0000 (11:42 +0200)
committerThomas Huth <thuth@redhat.com>
Mon, 25 Sep 2023 05:53:40 +0000 (07:53 +0200)
commitc64023b0ba677cfa6b878e82ea8e18507a597396
treee9e7f41c10878173656d81587dc201b05895d81b
parentb55e4b9c0525560577384adfc6d30eb0daa8d7be
meson.build: Make keyutils independent from keyring

Commit 0db0fbb5cf ("Add conditional dependency for libkeyutils")
tried to provide a possibility for the user to disable keyutils
if not required by makeing it depend on the keyring feature. This
looked reasonable at a first glance (the unit test in tests/unit/
needs both), but the condition in meson.build fails if the feature
is meant to be detected automatically, and there is also another
spot in backends/meson.build where keyutils is used independently
from keyring. So let's remove the dependency on keyring again and
introduce a proper meson build option instead.

Cc: qemu-stable@nongnu.org
Fixes: 0db0fbb5cf ("Add conditional dependency for libkeyutils")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1842
Message-ID: <20230824094208.255279-1-thuth@redhat.com>
Reviewed-by: "Daniel P. Berrangé" <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
meson.build
meson_options.txt
scripts/meson-buildoptions.sh