aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2021-06-03 15:01:35 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2021-07-06 08:33:51 +0200
commit6d7c7c2d1d95cc6cdb56706bfa0446ad68e2b952 (patch)
treec793ef3e9e0b87844909e6bc2797a6bf63ec9963
parent69d8de7a2d7c3512f6f7762abd8c1c1b9b4044e4 (diff)
downloadqemu-6d7c7c2d1d95cc6cdb56706bfa0446ad68e2b952.zip
qemu-6d7c7c2d1d95cc6cdb56706bfa0446ad68e2b952.tar.gz
qemu-6d7c7c2d1d95cc6cdb56706bfa0446ad68e2b952.tar.bz2
meson: store dependency('threads') in a variable
It can be useful for has_function checks. Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--meson.build3
-rw-r--r--util/meson.build1
2 files changed, 2 insertions, 2 deletions
diff --git a/meson.build b/meson.build
index 53dfc2b..e288e4c 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 97fad44..6af05a5 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'))