From e23460ce921168b4172af83043e87ca9bd85e43b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc-Andr=C3=A9=20Lureau?= Date: Wed, 2 Feb 2022 10:14:49 +0100 Subject: [PATCH] meson: require dynamic linking for VSS support MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The glib_dynamic detection does not work because the dependency is overridden in the main meson.build. Signed-off-by: Marc-André Lureau [Rewritten commit message, added requirement in qga/meson.build - Paolo] Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Konstantin Kostiuk Signed-off-by: Paolo Bonzini --- 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.11.0