Merge pull request #1493 from ailin-nemui/macsuffix

add explicit name_suffix to shared modules

(cherry picked from commit f1c9fb4296f1f2795d61b031302bfd9fe1fc7d6b)

meson.build

@@ -73,6 +73,16 @@ def_scriptdir  = '-D' + 'SCRIPTDIR'  + '="' + (get_option('prefix') / scriptdir)
 
 def_suppress_printf_fallback = '-D' + 'SUPPRESS_PRINTF_FALLBACK'
 
+
+module_suffix = []
+perl_module_suffix = []
+# Meson uses the wrong module extensions on Mac.
+# https://gitlab.gnome.org/GNOME/glib/issues/520
+if ['darwin', 'ios'].contains(host_machine.system())
+  module_suffix = 'so'
+  perl_module_suffix = 'bundle'
+endif
+
 ##############
 # Help files #
 ##############

src/irc/proxy/meson.build

@@ -9,6 +9,7 @@ shared_module('irc_proxy',
   + [ irssi_version_h ],
   include_directories : rootinc,
   implicit_include_directories : false,
+  name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   dependencies : dep,

src/otr/meson.build

@@ -11,6 +11,7 @@ shared_module('otr_core',
   ),
   include_directories : rootinc,
   implicit_include_directories : false,
+  name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   dependencies : dep,

src/perl/common/meson.build

@@ -20,6 +20,7 @@ libperl_Irssi_a = shared_module('Irssi',
   )
   + [ irssi_version_h ],
   name_prefix : '',
+  name_suffix : perl_module_suffix,
   install : true,
   install_dir : perlmoddir / 'auto' / 'Irssi',
   include_directories : rootinc,

src/perl/irc/meson.build

@@ -21,6 +21,7 @@ libperl_Irssi_Irc_a = shared_module('Irc',
     'module.h',
   ),
   name_prefix : '',
+  name_suffix : perl_module_suffix,
   install : true,
   install_dir : perlmoddir / 'auto' / 'Irssi' / 'Irc',
   include_directories : rootinc,

src/perl/meson.build

@@ -34,6 +34,7 @@ libperl_core_a = shared_module('perl_core',
   ],
   include_directories : [ rootinc ] + [ generated_files_inc ],
   implicit_include_directories : false,
+  name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   install_rpath : perl_rpath,
@@ -57,6 +58,7 @@ libfe_perl_a = shared_module('fe_perl',
   ],
   include_directories : rootinc,
   implicit_include_directories : false,
+  name_suffix : module_suffix,
   install : true,
   install_dir : moduledir,
   dependencies : dep,

src/perl/textui/meson.build

@@ -17,6 +17,7 @@ libperl_Irssi_TextUI_a = shared_module('TextUI',
     'module.h',
   ),
   name_prefix : '',
+  name_suffix : perl_module_suffix,
   install : true,
   install_dir : perlmoddir / 'auto' / 'Irssi' / 'TextUI',
   include_directories : rootinc,

src/perl/ui/meson.build

@@ -15,6 +15,7 @@ libperl_Irssi_UI_a = shared_module('UI',
     'module.h',
   ),
   name_prefix : '',
+  name_suffix : perl_module_suffix,
   install : true,
   install_dir : perlmoddir / 'auto' / 'Irssi' / 'UI',
   include_directories : rootinc,