[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 25/27] meson: require dynamic linking for VSS support
From: |
Paolo Bonzini |
Subject: |
[PATCH 25/27] meson: require dynamic linking for VSS support |
Date: |
Thu, 3 Feb 2022 18:33:57 +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]
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 804cc842dc..8c177435ac 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"''') \
.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
- [PATCH 23/27] meson: do not make qga/vss-win32/meson.build conditional on C++ presence, (continued)
- [PATCH 23/27] meson: do not make qga/vss-win32/meson.build conditional on C++ presence, Paolo Bonzini, 2022/02/03
- [PATCH 19/27] meson: drop --with-win-sdk, Paolo Bonzini, 2022/02/03
- [PATCH 21/27] qga/vss: use standard windows headers location, Paolo Bonzini, 2022/02/03
- [PATCH 16/27] meson: refine check for whether to look for virglrenderer, Paolo Bonzini, 2022/02/03
- [PATCH 22/27] configure, meson: replace VSS SDK checks and options with --enable-vss-sdk, Paolo Bonzini, 2022/02/03
- [PATCH 25/27] meson: require dynamic linking for VSS support,
Paolo Bonzini <=
- [PATCH 17/27] configure, meson: move OpenGL check to meson, Paolo Bonzini, 2022/02/03
- [PATCH 24/27] qga/vss-win32: require widl/midl, remove pre-built TLB file, Paolo Bonzini, 2022/02/03