[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 28/30] meson: require dynamic linking for VSS support
From: |
Paolo Bonzini |
Subject: |
[PULL 28/30] meson: require dynamic linking for VSS support |
Date: |
Tue, 15 Feb 2022 10:32:21 +0100 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
The glib_dynamic detection does not work because the dependency is
overridden in the main meson.build.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
[Rewritten commit message, added requirement in qga/meson.build - Paolo]
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
qga/meson.build | 2 ++
qga/vss-win32/meson.build | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/qga/meson.build b/qga/meson.build
index 4ac781cb33..d22ecb4187 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -22,6 +22,8 @@ have_qga_vss = get_option('qga_vss') \
Then run configure with: --extra-cxxflags="-isystem
/path/to/vss/inc/win2003"''') \
.require(midl.found() or widl.found(),
error_message: 'VSS support requires midl or widl') \
+ .require(not enable_static,
+ error_message: 'VSS support requires dynamic linking with GLib') \
.allowed()
all_qga = []
diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build
index c064a4e245..71c50d0866 100644
--- a/qga/vss-win32/meson.build
+++ b/qga/vss-win32/meson.build
@@ -1,4 +1,3 @@
-glib_dynamic = dependency('glib-2.0', static: false)
link_args = cc.get_supported_link_arguments([
'-fstack-protector-all',
'-fstack-protector-strong',
@@ -14,7 +13,8 @@ qga_vss = shared_module(
link_args: link_args,
vs_module_defs: 'qga-vss.def',
dependencies: [
- glib_dynamic, socket,
+ glib,
+ socket,
cc.find_library('ole32'),
cc.find_library('oleaut32'),
cc.find_library('shlwapi'),
--
2.34.1
- [PULL 15/30] configure, meson: move some default-disabled options to meson_options.txt, (continued)
- [PULL 15/30] configure, meson: move some default-disabled options to meson_options.txt, Paolo Bonzini, 2022/02/15
- [PULL 14/30] meson: define qemu_cflags/qemu_ldflags, Paolo Bonzini, 2022/02/15
- [PULL 13/30] configure, meson: move block layer options to meson_options.txt, Paolo Bonzini, 2022/02/15
- [PULL 16/30] configure, meson: move coroutine options to meson_options.txt, Paolo Bonzini, 2022/02/15
- [PULL 21/30] qga/vss-win32: fix midl arguments, Paolo Bonzini, 2022/02/15
- [PULL 20/30] configure, meson: move OpenGL check to meson, Paolo Bonzini, 2022/02/15
- [PULL 17/30] configure, meson: move smbd options to meson_options.txt, Paolo Bonzini, 2022/02/15
- [PULL 18/30] configure, meson: move guest-agent, tools to meson, Paolo Bonzini, 2022/02/15
- [PULL 22/30] meson: drop --with-win-sdk, Paolo Bonzini, 2022/02/15
- [PULL 25/30] configure, meson: replace VSS SDK checks and options with --enable-vss-sdk, Paolo Bonzini, 2022/02/15
- [PULL 28/30] meson: require dynamic linking for VSS support,
Paolo Bonzini <=
- [PULL 27/30] qga/vss-win32: require widl/midl, remove pre-built TLB file, Paolo Bonzini, 2022/02/15
- [PULL 19/30] meson: refine check for whether to look for virglrenderer, Paolo Bonzini, 2022/02/15
- [PULL 23/30] qga/vss-win32: use widl if available, Paolo Bonzini, 2022/02/15
- [PULL 24/30] qga/vss: use standard windows headers location, Paolo Bonzini, 2022/02/15
- [PULL 26/30] meson: do not make qga/vss-win32/meson.build conditional on C++ presence, Paolo Bonzini, 2022/02/15
- [PULL 30/30] configure, meson: move CONFIG_IASL to a Meson option, Paolo Bonzini, 2022/02/15
- [PULL 29/30] meson, configure: move ntddscsi API check to meson, Paolo Bonzini, 2022/02/15
- Re: [PULL 00/30] Misc mostly build system patches for 2022-02-15, Peter Maydell, 2022/02/16