[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/16] meson: move keyutils dependency check
From: |
marcandre . lureau |
Subject: |
[PATCH 07/16] meson: move keyutils dependency check |
Date: |
Fri, 28 Aug 2020 15:07:25 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Since there is not minimum version specified, and it's a test-only
dependency, it's fair to depend on a version that ships with a .pc I
suppose.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
configure | 25 -------------------------
meson.build | 6 ++----
2 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/configure b/configure
index 2471483bec..cb81fbc9b3 100755
--- a/configure
+++ b/configure
@@ -6324,28 +6324,6 @@ but not implemented on your system"
fi
fi
-##########################################
-# check for usable keyutils.h
-
-if test "$linux" = "yes" ; then
-
- have_keyutils=no
- cat > $TMPC << EOF
-#include <errno.h>
-#include <asm/unistd.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <keyutils.h>
-int main(void) {
- return request_key("user", NULL, NULL, 0);
-}
-EOF
- if compile_prog "" "-lkeyutils"; then
- have_keyutils=yes
- fi
-fi
-
-
##########################################
# End of CC checks
# After here, no more $cc or $ld runs
@@ -7535,9 +7513,6 @@ fi
if test "$secret_keyring" = "yes" ; then
echo "CONFIG_SECRET_KEYRING=y" >> $config_host_mak
- if test "$have_keyutils" = "yes" ; then
- echo "CONFIG_KEYUTILS=y" >> $config_host_mak
- fi
fi
if test "$tcg_interpreter" = "yes"; then
diff --git a/meson.build b/meson.build
index d69dd846d1..421f53083e 100644
--- a/meson.build
+++ b/meson.build
@@ -406,10 +406,7 @@ if 'CONFIG_TASN1' in config_host
tasn1 = declare_dependency(compile_args: config_host['TASN1_CFLAGS'].split(),
link_args: config_host['TASN1_LIBS'].split())
endif
-keyutils = not_found
-if 'CONFIG_KEYUTILS' in config_host
- keyutils = declare_dependency(link_args: '-lkeyutils')
-endif
+keyutils = dependency('keyutils', required: false)
# Create config-host.h
@@ -420,6 +417,7 @@ config_host_data.set('CONFIG_VNC_JPEG', jpeg.found())
config_host_data.set('CONFIG_VNC_PNG', png.found())
config_host_data.set('CONFIG_VNC_SASL', sasl.found())
config_host_data.set('CONFIG_XKBCOMMON', xkbcommon.found())
+config_host_data.set('CONFIG_KEYUTILS', keyutils.found())
config_host_data.set('QEMU_VERSION', '"@0@"'.format(meson.project_version()))
config_host_data.set('QEMU_VERSION_MAJOR',
meson.project_version().split('.')[0])
config_host_data.set('QEMU_VERSION_MINOR',
meson.project_version().split('.')[1])
--
2.26.2
- [PATCH 00/16] meson: convert unit tests in tests/Makefile.include, marcandre . lureau, 2020/08/28
- [PATCH 01/16] meson: build qapi tests library, marcandre . lureau, 2020/08/28
- [PATCH 02/16] meson: declare tasn1 dependency, marcandre . lureau, 2020/08/28
- [PATCH 03/16] meson: declare keyutils dependency, marcandre . lureau, 2020/08/28
- [PATCH 04/16] meson: convert qht-bench, marcandre . lureau, 2020/08/28
- [PATCH 05/16] tests: qga has virtio-serial by default when host has it, marcandre . lureau, 2020/08/28
- [PATCH 06/16] meson: convert the unit tests, marcandre . lureau, 2020/08/28
- [PATCH 07/16] meson: move keyutils dependency check,
marcandre . lureau <=
- [PATCH 08/16] meson: remove old socket_scm_helper rule, marcandre . lureau, 2020/08/28
- [PATCH 09/16] meson: convert vhost-user-bridge, marcandre . lureau, 2020/08/28
- [PATCH 10/16] meson: convert atomic*-bench, marcandre . lureau, 2020/08/28
- [PATCH 11/16] tests/Makefile.include: update check-build, marcandre . lureau, 2020/08/28
- [PATCH 12/16] tests: do not print benchmark output to stdout, marcandre . lureau, 2020/08/28
- [PATCH 13/16] meson: convert the speed tests, marcandre . lureau, 2020/08/28
- [PATCH 14/16] tests/migration/stress: remove unused exit_success, marcandre . lureau, 2020/08/28
- [PATCH 15/16] meson: fix migration/stress compilation with glib>=2.30, marcandre . lureau, 2020/08/28
- [PATCH 16/16] meson: convert migration/initrd-stress, marcandre . lureau, 2020/08/28