[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 24/40] meson: store dependency('threads') in a variable
From: |
Paolo Bonzini |
Subject: |
[PULL 24/40] meson: store dependency('threads') in a variable |
Date: |
Tue, 6 Jul 2021 12:01:25 +0200 |
It can be useful for has_function checks.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 3 ++-
util/meson.build | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 53dfc2b4c6..e288e4c21c 100644
--- a/meson.build
+++ b/meson.build
@@ -164,6 +164,7 @@ endif
multiprocess_allowed = targetos == 'linux' and not
get_option('multiprocess').disabled()
libm = cc.find_library('m', required: false)
+threads = dependency('threads')
util = cc.find_library('util', required: false)
winmm = []
socket = []
@@ -1999,7 +2000,7 @@ util_ss.add_all(trace_ss)
util_ss = util_ss.apply(config_all, strict: false)
libqemuutil = static_library('qemuutil',
sources: util_ss.sources() + stub_ss.sources() +
genh,
- dependencies: [util_ss.dependencies(), libm,
glib, socket, malloc, pixman])
+ dependencies: [util_ss.dependencies(), libm,
threads, glib, socket, malloc, pixman])
qemuutil = declare_dependency(link_with: libqemuutil,
sources: genh + version_res)
diff --git a/util/meson.build b/util/meson.build
index 97fad44105..6af05a5716 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -1,4 +1,3 @@
-util_ss.add(dependency('threads'))
util_ss.add(files('osdep.c', 'cutils.c', 'unicode.c', 'qemu-timer-common.c'))
util_ss.add(when: 'CONFIG_ATOMIC64', if_false: files('atomic64.c'))
util_ss.add(when: 'CONFIG_POSIX', if_true: files('aio-posix.c'))
--
2.31.1
- [PULL 19/40] configure, meson: convert libdaxctl detection to meson, (continued)
- [PULL 19/40] configure, meson: convert libdaxctl detection to meson, Paolo Bonzini, 2021/07/06
- [PULL 14/40] target/i386: Populate x86_ext_save_areas offsets using cpuid where possible, Paolo Bonzini, 2021/07/06
- [PULL 20/40] configure, meson: convert libpmem detection to meson, Paolo Bonzini, 2021/07/06
- [PULL 21/40] configure, meson: convert liburing detection to meson, Paolo Bonzini, 2021/07/06
- [PULL 25/40] configure, meson: move CONFIG_IVSHMEM to meson, Paolo Bonzini, 2021/07/06
- [PULL 22/40] configure, meson: convert libxml2 detection to meson, Paolo Bonzini, 2021/07/06
- [PULL 26/40] configure: convert HAVE_BROKEN_SIZE_MAX to meson, Paolo Bonzini, 2021/07/06
- [PULL 27/40] configure: convert compiler tests to meson, part 1, Paolo Bonzini, 2021/07/06
- [PULL 15/40] target/i386: Move X86XSaveArea into TCG, Paolo Bonzini, 2021/07/06
- [PULL 34/40] keyval: introduce keyval_merge, Paolo Bonzini, 2021/07/06
- [PULL 24/40] meson: store dependency('threads') in a variable,
Paolo Bonzini <=
- [PULL 28/40] configure: convert compiler tests to meson, part 2, Paolo Bonzini, 2021/07/06
- [PULL 29/40] configure: convert compiler tests to meson, part 3, Paolo Bonzini, 2021/07/06
- [PULL 31/40] configure: convert compiler tests to meson, part 5, Paolo Bonzini, 2021/07/06
- [PULL 30/40] configure: convert compiler tests to meson, part 4, Paolo Bonzini, 2021/07/06
- [PULL 33/40] qom: export more functions for use with non-UserCreatable objects, Paolo Bonzini, 2021/07/06
- [PULL 40/40] config-host.mak: remove unused compiler-related lines, Paolo Bonzini, 2021/07/06
- [PULL 35/40] keyval: introduce keyval_parse_into, Paolo Bonzini, 2021/07/06
- [PULL 36/40] vl: switch -M parsing to keyval, Paolo Bonzini, 2021/07/06