diff options
| author | David Robillard <d@drobilla.net> | 2022-08-31 19:18:06 -0400 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2022-08-31 19:19:44 -0400 |
| commit | beebc304791447d850ddf181a3af563fe3cb5131 (patch) | |
| tree | 17c8be1962146088235591ecb9b4a3335ced64ae | |
| parent | 6685d86e36e410d2a3bc7c18bacf686a438e509f (diff) | |
| download | suil-beebc304791447d850ddf181a3af563fe3cb5131.tar.gz suil-beebc304791447d850ddf181a3af563fe3cb5131.tar.bz2 suil-beebc304791447d850ddf181a3af563fe3cb5131.zip | |
Fix opening wrapped UIs multiple times in Gtk
The unfortunate but (more or less) necessary nodelete linker flag got dropped
in the meson transition.
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | meson.build | 8 |
2 files changed, 10 insertions, 1 deletions
@@ -2,8 +2,9 @@ suil (0.10.17) unstable; urgency=medium * Add project metadata * Fix MacOS build when Gtk3 and Qt5 are present without X11 + * Fix opening wrapped UIs multiple times in Gtk - -- David Robillard <d@drobilla.net> Tue, 16 Aug 2022 00:34:49 +0000 + -- David Robillard <d@drobilla.net> Wed, 31 Aug 2022 23:16:45 +0000 suil (0.10.16) stable; urgency=medium diff --git a/meson.build b/meson.build index b19e5e0..c72af31 100644 --- a/meson.build +++ b/meson.build @@ -43,6 +43,9 @@ subdir('meson/suppressions') suil_abs_module_dir = get_option('prefix') / suil_module_dir platform_defines = ['-DSUIL_MODULE_DIR="@0@"'.format(suil_abs_module_dir)] +nodelete_c_link_args = cc.get_supported_link_arguments(['-Wl,-z,nodelete']) +nodelete_cpp_link_args = cpp.get_supported_link_arguments(['-Wl,-z,nodelete']) + ################ # Dependencies # ################ @@ -220,6 +223,7 @@ if gtk2_dep.found() and qt5_dep.found() include_directories: include_dirs, install: true, install_dir: suil_module_dir, + link_args: nodelete_cpp_link_args, ) endif @@ -233,6 +237,7 @@ if gtk2_dep.found() and gtk2_x11_dep.found() and x11_dep.found() include_directories: include_dirs, install: true, install_dir: suil_module_dir, + link_args: nodelete_c_link_args, ) endif @@ -246,6 +251,7 @@ if gtk3_dep.found() and gtk3_x11_dep.found() and x11_dep.found() include_directories: include_dirs, install: true, install_dir: suil_module_dir, + link_args: nodelete_c_link_args, ) endif @@ -259,6 +265,7 @@ if gtk3_dep.found() and gtk3_x11_dep.found() and qt5_dep.found() include_directories: include_dirs, install: true, install_dir: suil_module_dir, + link_args: nodelete_cpp_link_args, ) endif @@ -285,6 +292,7 @@ if gtk2_dep.found() and host_machine.system() == 'windows' include_directories: include_dirs, install: true, install_dir: suil_module_dir, + link_args: nodelete_cpp_link_args, ) endif |