aboutsummaryrefslogtreecommitdiff
path: root/storage-daemon
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2024-05-24 13:17:08 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2024-07-03 18:41:25 +0200
commite8f62689acd5930a712655d0c6838ec5eccc6b1c (patch)
treefd08db82cbbde099a9e0cc879286108b38a6ca0d /storage-daemon
parentfae7a427c787359fc4a3bc244541c5bd9e8e14bc (diff)
meson: move block.syms dependency out of libblock
In order to define libqemuutil symbols that are requested by block modules, QEMU currently uses a combination of the "link_depends" argument of libraries (which is propagated into dependencies, but not available in dependencies) and the "link_args" argument of declare_dependency() (which _is_ available in static_library, but probably not used for historical reasons only). Unfortunately the link_depends will not be propagated into the "block" dependency if it is defined using declare_dependency(objects: ...); and it is not possible to add it directly to the dependency because the keyword argument simply is not available. The only solution, in order to switch to defining the dependency without using "link_whole" (which has problems of its own, see https://github.com/mesonbuild/meson/pull/8151#issuecomment-754796420), is unfortunately to add the link_args and link_depends to the executables directly; fortunately there is just four of them. It is possible (and I will look into it) to add "link_depends" to declare_dependency(), but it probably will be a while before QEMU can use it. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'storage-daemon')
-rw-r--r--storage-daemon/meson.build1
1 files changed, 1 insertions, 0 deletions
diff --git a/storage-daemon/meson.build b/storage-daemon/meson.build
index 46267b63e7..fd5e32f4b2 100644
--- a/storage-daemon/meson.build
+++ b/storage-daemon/meson.build
@@ -8,6 +8,7 @@ if have_tools
qsd_ss = qsd_ss.apply({})
qsd = executable('qemu-storage-daemon',
qsd_ss.sources(),
+ link_args: '@block.syms', link_depends: block_syms,
dependencies: qsd_ss.dependencies(),
install: true)
endif