diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2022-02-02 10:14:49 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-02-21 10:35:54 +0100 |
| commit | e23460ce921168b4172af83043e87ca9bd85e43b (patch) | |
| tree | 3afaa5ec30e2d4fb3c85b72b63cb0160b4f14c73 | |
| parent | 23011f44d79aa982b9dbb21ffabadf0fa89066bd (diff) | |
meson: require dynamic linking for VSS support
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>
| -rw-r--r-- | qga/meson.build | 2 | ||||
| -rw-r--r-- | 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'), |