From 989ddd8429173a3b5fa7feda1c09f4b717af3d79 Mon Sep 17 00:00:00 2001 From: Ailin Nemui Date: Fri, 25 Jul 2025 19:49:53 +0200 Subject: [PATCH] replace shared_module with shared_library according to mesonbuild irc chat --- src/fe-common/irc/dcc/meson.build | 5 +++-- src/fe-common/irc/meson.build | 5 +++-- src/fe-common/irc/notifylist/meson.build | 5 +++-- src/irc/core/meson.build | 5 +++-- src/irc/dcc/meson.build | 5 +++-- src/irc/flood/meson.build | 5 +++-- src/irc/notifylist/meson.build | 5 +++-- src/irc/proxy/meson.build | 3 ++- src/otr/meson.build | 3 ++- src/perl/common/meson.build | 3 ++- src/perl/irc/meson.build | 3 ++- src/perl/meson.build | 7 ++++--- src/perl/textui/meson.build | 3 ++- src/perl/ui/meson.build | 3 ++- 14 files changed, 37 insertions(+), 23 deletions(-) diff --git a/src/fe-common/irc/dcc/meson.build b/src/fe-common/irc/dcc/meson.build index f380fb10..5edf2477 100644 --- a/src/fe-common/irc/dcc/meson.build +++ b/src/fe-common/irc/dcc/meson.build @@ -17,12 +17,13 @@ libfe_irc_dcc_a = static_library('fe_irc_dcc', def_sysconfdir, ], dependencies : dep) -shared_module('fe_irc_dcc', +shared_library('fe_irc_dcc', name_suffix : module_suffix, install : true, install_dir : moduledir, link_with : dl_cross_irc_dcc + dl_cross_irc_core + dl_cross_irssi_main, - link_whole : libfe_irc_dcc_a) + link_whole : libfe_irc_dcc_a, + override_options : ['b_lundef=false']) install_headers( files( diff --git a/src/fe-common/irc/meson.build b/src/fe-common/irc/meson.build index decce520..518dfbfa 100644 --- a/src/fe-common/irc/meson.build +++ b/src/fe-common/irc/meson.build @@ -28,12 +28,13 @@ libfe_common_irc_a = static_library('fe_common_irc', def_themesdir, ], dependencies : dep) -shared_module('fe_common_irc', +shared_library('fe_common_irc', name_suffix : module_suffix, install : true, install_dir : moduledir, link_with : dl_cross_irc_core + dl_cross_irssi_main, - link_whole : libfe_common_irc_a) + link_whole : libfe_common_irc_a, + override_options : ['b_lundef=false']) install_headers( files( diff --git a/src/fe-common/irc/notifylist/meson.build b/src/fe-common/irc/notifylist/meson.build index fd28306b..cdb5168b 100644 --- a/src/fe-common/irc/notifylist/meson.build +++ b/src/fe-common/irc/notifylist/meson.build @@ -12,12 +12,13 @@ libfe_irc_notifylist_a = static_library('fe_irc_notifylist', def_sysconfdir, ], dependencies : dep) -shared_module('fe_irc_notifylist', +shared_library('fe_irc_notifylist', name_suffix : module_suffix, install : true, install_dir : moduledir, link_with : dl_cross_irc_notifylist + dl_cross_irssi_main, - link_whole : libfe_irc_notifylist_a) + link_whole : libfe_irc_notifylist_a, + override_options : ['b_lundef=false']) install_headers( files( diff --git a/src/irc/core/meson.build b/src/irc/core/meson.build index 40ef1cdd..94ed20a2 100644 --- a/src/irc/core/meson.build +++ b/src/irc/core/meson.build @@ -39,12 +39,13 @@ libirc_core_a = static_library('irc_core', def_sysconfdir, ], dependencies : dep) -libirc_core_sm = shared_module('irc_core', +libirc_core_sm = shared_library('irc_core', name_suffix : module_suffix, install : true, install_dir : moduledir, link_whole : libirc_core_a, - link_with : dl_cross_irssi_main) + link_with : dl_cross_irssi_main, + override_options : ['b_lundef=false']) dl_cross_irc_core = [] if need_dl_cross_link diff --git a/src/irc/dcc/meson.build b/src/irc/dcc/meson.build index cf5b1365..3ab1bace 100644 --- a/src/irc/dcc/meson.build +++ b/src/irc/dcc/meson.build @@ -1,6 +1,6 @@ # this file is part of irssi -libirc_dcc_sm = shared_module('irc_dcc', +libirc_dcc_sm = shared_library('irc_dcc', files( 'dcc-autoget.c', 'dcc-chat.c', @@ -17,7 +17,8 @@ libirc_dcc_sm = shared_module('irc_dcc', install : true, install_dir : moduledir, link_with : dl_cross_irc_core + dl_cross_irssi_main, - dependencies : dep) + dependencies : dep, + override_options : ['b_lundef=false']) dl_cross_irc_dcc = [] if need_dl_cross_link diff --git a/src/irc/flood/meson.build b/src/irc/flood/meson.build index 02ad222b..257e5c11 100644 --- a/src/irc/flood/meson.build +++ b/src/irc/flood/meson.build @@ -8,12 +8,13 @@ libirc_flood_a = static_library('irc_flood', include_directories : rootinc, implicit_include_directories : false, dependencies : dep) -shared_module('irc_flood', +shared_library('irc_flood', name_suffix : module_suffix, install : true, install_dir : moduledir, link_with : dl_cross_irc_core + dl_cross_irssi_main, - link_whole : libirc_flood_a) + link_whole : libirc_flood_a, + override_options : ['b_lundef=false']) install_headers( files('module.h'), diff --git a/src/irc/notifylist/meson.build b/src/irc/notifylist/meson.build index 1bf9dd98..34517b34 100644 --- a/src/irc/notifylist/meson.build +++ b/src/irc/notifylist/meson.build @@ -1,6 +1,6 @@ # this file is part of irssi -libirc_notifylist_sm = shared_module('irc_notifylist', +libirc_notifylist_sm = shared_library('irc_notifylist', files( 'notify-commands.c', 'notify-ison.c', @@ -14,7 +14,8 @@ libirc_notifylist_sm = shared_module('irc_notifylist', install : true, install_dir : moduledir, link_with : dl_cross_irc_core + dl_cross_irssi_main, - dependencies : dep) + dependencies : dep, + override_options : ['b_lundef=false']) dl_cross_irc_notifylist = [] if need_dl_cross_link diff --git a/src/irc/proxy/meson.build b/src/irc/proxy/meson.build index 30ac90a4..4cc2b658 100644 --- a/src/irc/proxy/meson.build +++ b/src/irc/proxy/meson.build @@ -1,6 +1,6 @@ # this file is part of irssi -shared_module('irc_proxy', +shared_library('irc_proxy', files( 'dump.c', 'listen.c', @@ -13,6 +13,7 @@ shared_module('irc_proxy', install : true, install_dir : moduledir, dependencies : dep, + override_options : ['b_lundef=false'], ) # noinst_headers = files( diff --git a/src/otr/meson.build b/src/otr/meson.build index 5b7d256f..13b564ea 100644 --- a/src/otr/meson.build +++ b/src/otr/meson.build @@ -1,6 +1,6 @@ # this file is part of irssi -shared_module('otr_core', +shared_library('otr_core', files( 'key.c', 'otr-fe.c', @@ -15,6 +15,7 @@ shared_module('otr_core', install : true, install_dir : moduledir, dependencies : dep, + override_options : ['b_lundef=false'], ) # noinst_headers = files( diff --git a/src/perl/common/meson.build b/src/perl/common/meson.build index ae408a7e..0f3f3bb5 100644 --- a/src/perl/common/meson.build +++ b/src/perl/common/meson.build @@ -1,5 +1,5 @@ -shared_module('Irssi', +shared_library('Irssi', [ xsubpp.process( files( 'Channel.xs', @@ -27,6 +27,7 @@ shared_module('Irssi', implicit_include_directories : true, dependencies : dep + [ perl_dep ], link_with : dl_cross_perl_core + dl_cross_irssi_main, + override_options : ['b_lundef=false'], ) install_headers( diff --git a/src/perl/irc/meson.build b/src/perl/irc/meson.build index 7b366aa8..e033c260 100644 --- a/src/perl/irc/meson.build +++ b/src/perl/irc/meson.build @@ -1,4 +1,4 @@ -shared_module('Irc', +shared_library('Irc', [ xsubpp.process( files( 'Channel.xs', @@ -28,6 +28,7 @@ shared_module('Irc', implicit_include_directories : true, dependencies : dep + [ perl_dep ], link_with : dl_cross_perl_core + dl_cross_irc_dcc + dl_cross_irc_notifylist + dl_cross_irc_core + dl_cross_irssi_main, + override_options : ['b_lundef=false'], ) install_headers( diff --git a/src/perl/meson.build b/src/perl/meson.build index 09d4f8a6..1c6e2fbc 100644 --- a/src/perl/meson.build +++ b/src/perl/meson.build @@ -17,7 +17,7 @@ irssi_core_pl_h = custom_target('irssi-core.pl.h', # required as of Meson 0.58.0 generated_files_inc = include_directories('.') -libperl_core_sm = shared_module('perl_core', +libperl_core_sm = shared_library('perl_core', files( 'perl-common.c', 'perl-core.c', @@ -39,7 +39,7 @@ libperl_core_sm = shared_module('perl_core', install_rpath : perl_rpath, build_rpath : perl_rpath, dependencies : dep_cflagsonly + [ perl_dep ] + dl_cross_dep, - override_options : ['b_asneeded=false'], + override_options : ['b_asneeded=false', 'b_lundef=false'], link_with : dl_cross_irssi_main, ) @@ -48,7 +48,7 @@ if need_dl_cross_link dl_cross_perl_core += libperl_core_sm endif -shared_module('fe_perl', +shared_library('fe_perl', files( 'module-formats.c', 'perl-fe.c', @@ -63,6 +63,7 @@ shared_module('fe_perl', install_dir : moduledir, dependencies : dep, link_with : dl_cross_perl_core + dl_cross_irssi_main, + override_options : ['b_lundef=false'], ) subdir('common') diff --git a/src/perl/textui/meson.build b/src/perl/textui/meson.build index 5b2ed136..b7d769c5 100644 --- a/src/perl/textui/meson.build +++ b/src/perl/textui/meson.build @@ -1,4 +1,4 @@ -shared_module('TextUI', +shared_library('TextUI', [ xsubpp.process( files( 'Statusbar.xs', @@ -24,6 +24,7 @@ shared_module('TextUI', implicit_include_directories : true, dependencies : dep + [ perl_dep ], link_with : dl_cross_perl_core + dl_cross_irssi_main, + override_options : ['b_lundef=false'], ) install_headers( diff --git a/src/perl/ui/meson.build b/src/perl/ui/meson.build index e74d0898..a6e5c93c 100644 --- a/src/perl/ui/meson.build +++ b/src/perl/ui/meson.build @@ -1,4 +1,4 @@ -shared_module('UI', +shared_library('UI', [ xsubpp.process( files( 'Formats.xs', @@ -22,6 +22,7 @@ shared_module('UI', implicit_include_directories : true, dependencies : dep + [ perl_dep ], link_with : dl_cross_perl_core + dl_cross_irssi_main, + override_options : ['b_lundef=false'], ) install_headers(