diff options
| author | Kostiantyn Kostiuk <konstantin@daynix.com> | 2021-03-01 13:16:07 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-03-06 11:41:54 +0100 |
| commit | 9f34101db00eabd8f424e98b481c2394e6509198 (patch) | |
| tree | 82f67ed90cfbd10e914b45ad6b0d736a97a07a8a | |
| parent | 2c933ac6a883606b85f8cf271bfb40379d077e97 (diff) | |
| download | focaccia-qemu-9f34101db00eabd8f424e98b481c2394e6509198.tar.gz focaccia-qemu-9f34101db00eabd8f424e98b481c2394e6509198.zip | |
qga-vss: Use dynamic linking for GLib
The current GLib version implements the DllMain function. DllMain is also present in the provider.cpp code. So in the case of static linking, the DllMain redefinition error occurs. For now, just switch to dynamic linking and revert this patch when the issue will be solved. See Glib issue for more details https://gitlab.gnome.org/GNOME/glib/-/issues/692 Signed-off-by: Kostiantyn Kostiuk <konstantin@daynix.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | qga/vss-win32/meson.build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build index 780c461432..90825edef3 100644 --- a/qga/vss-win32/meson.build +++ b/qga/vss-win32/meson.build @@ -1,5 +1,5 @@ if add_languages('cpp', required: false) - glib_static = dependency('glib-2.0', static: true) + glib_dynamic = dependency('glib-2.0', static: false) link_args = cc.get_supported_link_arguments(['-fstack-protector-all', '-fstack-protector-strong', '-Wl,--add-stdcall-alias', '-Wl,--enable-stdcall-fixup']) @@ -8,7 +8,7 @@ if add_languages('cpp', required: false) cpp_args: ['-Wno-unknown-pragmas', '-Wno-delete-non-virtual-dtor', '-Wno-non-virtual-dtor'], link_args: link_args, vs_module_defs: 'qga-vss.def', - dependencies: [glib_static, socket, + dependencies: [glib_dynamic, socket, cc.find_library('ole32'), cc.find_library('oleaut32'), cc.find_library('shlwapi'), |