From ce12c204042c3cc667414d58241863987610028a Mon Sep 17 00:00:00 2001 From: Fred Morcos Date: Mon, 21 Aug 2023 18:17:27 +0200 Subject: [PATCH] Meson: Use link_whole for backend library archive files --- modules/bindbackend/meson.build | 4 ++-- modules/gmysqlbackend/meson.build | 4 ++-- modules/godbcbackend/meson.build | 4 ++-- modules/gpgsqlbackend/meson.build | 4 ++-- modules/gsqlite3backend/meson.build | 4 ++-- modules/ldapbackend/meson.build | 4 ++-- modules/lua2backend/meson.build | 4 ++-- modules/pipebackend/meson.build | 4 ++-- modules/remotebackend/meson.build | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/bindbackend/meson.build b/modules/bindbackend/meson.build index e113ac2630..0b8472c870 100644 --- a/modules/bindbackend/meson.build +++ b/modules/bindbackend/meson.build @@ -23,8 +23,8 @@ lib = static_library( dep_name = 'dep_' + module_backend_name set_variable(dep_name, dependency('', required: false)) if module_opt == 'static' - dep = declare_dependency(link_with: lib) + dep = declare_dependency(link_whole: lib) set_variable(dep_name, dep) else - shared_module(module_backend_name, link_with: lib) + shared_module(module_backend_name, link_whole: lib) endif diff --git a/modules/gmysqlbackend/meson.build b/modules/gmysqlbackend/meson.build index 0b3132d595..a8a51ed04c 100644 --- a/modules/gmysqlbackend/meson.build +++ b/modules/gmysqlbackend/meson.build @@ -29,8 +29,8 @@ lib = static_library( dep_name = 'dep_' + module_backend_name set_variable(dep_name, dependency('', required: false)) if module_opt == 'static' - dep = declare_dependency(link_with: lib) + dep = declare_dependency(link_whole: lib) set_variable(dep_name, dep) else - shared_module(module_backend_name, link_with: lib) + shared_module(module_backend_name, link_whole: lib) endif diff --git a/modules/godbcbackend/meson.build b/modules/godbcbackend/meson.build index 77e7ec1e1b..f9e526f254 100644 --- a/modules/godbcbackend/meson.build +++ b/modules/godbcbackend/meson.build @@ -25,8 +25,8 @@ lib = static_library( dep_name = 'dep_' + module_backend_name set_variable(dep_name, dependency('', required: false)) if module_opt == 'static' - dep = declare_dependency(link_with: lib) + dep = declare_dependency(link_whole: lib) set_variable(dep_name, dep) else - shared_module(module_backend_name, link_with: lib) + shared_module(module_backend_name, link_whole: lib) endif diff --git a/modules/gpgsqlbackend/meson.build b/modules/gpgsqlbackend/meson.build index 6c560dc80c..65a22a49c6 100644 --- a/modules/gpgsqlbackend/meson.build +++ b/modules/gpgsqlbackend/meson.build @@ -28,8 +28,8 @@ lib = static_library( dep_name = 'dep_' + module_backend_name set_variable(dep_name, dependency('', required: false)) if module_opt == 'static' - dep = declare_dependency(link_with: lib) + dep = declare_dependency(link_whole: lib) set_variable(dep_name, dep) else - shared_module(module_backend_name, link_with: lib) + shared_module(module_backend_name, link_whole: lib) endif diff --git a/modules/gsqlite3backend/meson.build b/modules/gsqlite3backend/meson.build index d1b780250e..6e879015f0 100644 --- a/modules/gsqlite3backend/meson.build +++ b/modules/gsqlite3backend/meson.build @@ -26,8 +26,8 @@ lib = static_library( dep_name = 'dep_' + module_backend_name set_variable(dep_name, dependency('', required: false)) if module_opt == 'static' - dep = declare_dependency(link_with: lib) + dep = declare_dependency(link_whole: lib) set_variable(dep_name, dep) else - shared_module(module_backend_name, link_with: lib) + shared_module(module_backend_name, link_whole: lib) endif diff --git a/modules/ldapbackend/meson.build b/modules/ldapbackend/meson.build index 8f1d7d22fc..fa22dfe800 100644 --- a/modules/ldapbackend/meson.build +++ b/modules/ldapbackend/meson.build @@ -32,8 +32,8 @@ lib = static_library( dep_name = 'dep_' + module_backend_name set_variable(dep_name, dependency('', required: false)) if module_opt == 'static' - dep = declare_dependency(link_with: lib) + dep = declare_dependency(link_whole: lib) set_variable(dep_name, dep) else - shared_module(module_backend_name, link_with: lib) + shared_module(module_backend_name, link_whole: lib) endif diff --git a/modules/lua2backend/meson.build b/modules/lua2backend/meson.build index 62f35be054..304ec25789 100644 --- a/modules/lua2backend/meson.build +++ b/modules/lua2backend/meson.build @@ -20,8 +20,8 @@ lib = static_library( dep_name = 'dep_' + module_backend_name set_variable(dep_name, dependency('', required: false)) if module_opt == 'static' - dep = declare_dependency(link_with: lib) + dep = declare_dependency(link_whole: lib) set_variable(dep_name, dep) else - shared_module(module_backend_name, link_with: lib) + shared_module(module_backend_name, link_whole: lib) endif diff --git a/modules/pipebackend/meson.build b/modules/pipebackend/meson.build index 264fb1cc48..f526dd94cf 100644 --- a/modules/pipebackend/meson.build +++ b/modules/pipebackend/meson.build @@ -22,8 +22,8 @@ lib = static_library( dep_name = 'dep_' + module_backend_name set_variable(dep_name, dependency('', required: false)) if module_opt == 'static' - dep = declare_dependency(link_with: lib) + dep = declare_dependency(link_whole: lib) set_variable(dep_name, dep) else - shared_module(module_backend_name, link_with: lib) + shared_module(module_backend_name, link_whole: lib) endif diff --git a/modules/remotebackend/meson.build b/modules/remotebackend/meson.build index fdc5ca1a0b..a628743305 100644 --- a/modules/remotebackend/meson.build +++ b/modules/remotebackend/meson.build @@ -47,8 +47,8 @@ lib = static_library( dep_name = 'dep_' + module_backend_name set_variable(dep_name, dependency('', required: false)) if module_opt == 'static' - dep = declare_dependency(link_with: lib) + dep = declare_dependency(link_whole: lib) set_variable(dep_name, dep) else - shared_module(module_backend_name, link_with: lib) + shared_module(module_backend_name, link_whole: lib) endif -- 2.47.2