meson: support unified suffixes for modules

A long story in a few words: sometimes on macos modules will be compiled
into .dylib, sometimes, into .so suffix. We did not set the suffix
everywhere in our meson build instructions, hence our suffixes have been
differently, which resulted in random load fails on different maschines.

With this commit, we ensure that we suffix all modules the same way.

Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Differential Revision: https://phab.enlightenment.org/D11650

diff --git a/src/edje_external/elementary/meson.build b/src/edje_external/elementary/meson.build
index 383ab77..033b54e 100644 (file)
--- a/src/edje_external/elementary/meson.build
+++ b/src/edje_external/elementary/meson.build
@@ -46,5 +46,6 @@ ecore_systemd_mod = shared_module('elementary',
     install: true,
     install_dir: mod_install_dir,
     c_args : elm_package_c_args,
+    name_suffix : sys_mod_extension
 )
 module_files += join_paths(mod_install_dir, 'libelementary.' + sys_mod_extension)

diff --git a/src/edje_external/emotion/meson.build b/src/edje_external/emotion/meson.build
index 63e6ff8..5d869d8 100644 (file)
--- a/src/edje_external/emotion/meson.build
+++ b/src/edje_external/emotion/meson.build
@@ -3,6 +3,7 @@ ecore_systemd_mod = shared_module('emotion',
     dependencies: [edje, emotion],
     install: true,
     install_dir: mod_install_dir,
-    c_args : emotion_package_c_args
+    c_args : emotion_package_c_args,
+    name_suffix : sys_mod_extension
 )
 module_files += join_paths(mod_install_dir, 'libemotion.' + sys_mod_extension)

diff --git a/src/modules/ecore/system/systemd/meson.build b/src/modules/ecore/system/systemd/meson.build
index 7649611..2a1104c 100644 (file)
--- a/src/modules/ecore/system/systemd/meson.build
+++ b/src/modules/ecore/system/systemd/meson.build
@@ -4,6 +4,7 @@ if get_option('systemd')
       dependencies: [ecore, eldbus],
       install: true,
       install_dir: mod_install_dir,
+      name_suffix : sys_mod_extension
   )
   module_files += join_paths(mod_install_dir, 'libsystemd.' + sys_mod_extension)
 endif

diff --git a/src/modules/ecore/system/tizen/meson.build b/src/modules/ecore/system/tizen/meson.build
index 78c7640..8d9db22 100644 (file)
--- a/src/modules/ecore/system/tizen/meson.build
+++ b/src/modules/ecore/system/tizen/meson.build
@@ -3,5 +3,6 @@ ecore_systemd_mod = shared_module('tizen',
     dependencies: [ecore, eldbus],
     install: true,
     install_dir: mod_install_dir,
+    name_suffix : sys_mod_extension
 )
 module_files += join_paths(mod_install_dir, 'libtizen.' + sys_mod_extension)

diff --git a/src/modules/ecore/system/upower/meson.build b/src/modules/ecore/system/upower/meson.build
index ea1a20b..b579bed 100644 (file)
--- a/src/modules/ecore/system/upower/meson.build
+++ b/src/modules/ecore/system/upower/meson.build
@@ -3,5 +3,6 @@ ecore_systemd_mod = shared_module('upower',
     dependencies: [ecore, eldbus],
     install: true,
     install_dir: mod_install_dir,
+    name_suffix : sys_mod_extension
 )
 module_files += join_paths(mod_install_dir, 'libupower.' + sys_mod_extension)

diff --git a/src/modules/ecore_buffer/shm/meson.build b/src/modules/ecore_buffer/shm/meson.build
index baf9a0f..80c0a79 100644 (file)
--- a/src/modules/ecore_buffer/shm/meson.build
+++ b/src/modules/ecore_buffer/shm/meson.build
@@ -3,5 +3,6 @@ ecore_buffer_shm_mod = shared_module('module',
     name_prefix: '',
     dependencies: [ecore, ecore_buffer],
     install: true,
-    install_dir: join_paths(dir_lib, 'ecore_buffer', 'modules', 'shm', version_name)
+    install_dir: join_paths(dir_lib, 'ecore_buffer', 'modules', 'shm', version_name),
+    name_suffix : sys_mod_extension
 )

diff --git a/src/modules/ecore_buffer/x11_dri2/meson.build b/src/modules/ecore_buffer/x11_dri2/meson.build
index b63823b..34cca89 100644 (file)
--- a/src/modules/ecore_buffer/x11_dri2/meson.build
+++ b/src/modules/ecore_buffer/x11_dri2/meson.build
@@ -3,5 +3,6 @@ ecore_buffer_x11_dri2_mod = shared_module('module',
     name_prefix: '',
     dependencies: [ecore, ecore_buffer, ecore_x],
     install: true,
-    install_dir: join_paths(dir_lib, 'ecore_buffer', 'modules', 'x11_dri2', version_name)
+    install_dir: join_paths(dir_lib, 'ecore_buffer', 'modules', 'x11_dri2', version_name),
+    name_suffix : sys_mod_extension
 )

diff --git a/src/modules/ecore_buffer/x11_dri3/meson.build b/src/modules/ecore_buffer/x11_dri3/meson.build
index e3a7dd1..ce89219 100644 (file)
--- a/src/modules/ecore_buffer/x11_dri3/meson.build
+++ b/src/modules/ecore_buffer/x11_dri3/meson.build
@@ -4,6 +4,7 @@ if dependency('libtbm', required: false).found() == true and dependency('libdrm'
     name_prefix: '',
     dependencies: [ecore, ecore_buffer, ecore_x],
     install: true,
-    install_dir: join_paths(dir_lib, 'ecore_buffer', 'modules', 'x11_dri3', version_name)
+    install_dir: join_paths(dir_lib, 'ecore_buffer', 'modules', 'x11_dri3', version_name),
+    name_suffix : sys_mod_extension
   )
 endif

diff --git a/src/modules/ecore_imf/ibus/meson.build b/src/modules/ecore_imf/ibus/meson.build
index f815439..57bc90f 100644 (file)
--- a/src/modules/ecore_imf/ibus/meson.build
+++ b/src/modules/ecore_imf/ibus/meson.build
@@ -10,5 +10,6 @@ shared_module(mod_name,
     mod_src,
     dependencies: mod_deps,
     install: true,
-    install_dir : mod_install_dir
+    install_dir : mod_install_dir,
+    name_suffix : sys_mod_extension
 )

diff --git a/src/modules/ecore_imf/scim/meson.build b/src/modules/ecore_imf/scim/meson.build
index 9356a00..6f67ebc 100644 (file)
--- a/src/modules/ecore_imf/scim/meson.build
+++ b/src/modules/ecore_imf/scim/meson.build
@@ -15,5 +15,6 @@ shared_module(mod_name,
     mod_src,
     dependencies: mod_deps,
     install: true,
-    install_dir : mod_install_dir
+    install_dir : mod_install_dir,
+    name_suffix : sys_mod_extension
 )

diff --git a/src/modules/ecore_imf/wayland/meson.build b/src/modules/ecore_imf/wayland/meson.build
index f49cc3f..80832ca 100644 (file)
--- a/src/modules/ecore_imf/wayland/meson.build
+++ b/src/modules/ecore_imf/wayland/meson.build
@@ -12,5 +12,6 @@ shared_module(mod_name,
     mod_src,
     dependencies: mod_deps,
     install: true,
-    install_dir : mod_install_dir
+    install_dir : mod_install_dir,
+    name_suffix : sys_mod_extension
 )

diff --git a/src/modules/ecore_imf/xim/meson.build b/src/modules/ecore_imf/xim/meson.build
index 4ffa1f1..d5411c7 100644 (file)
--- a/src/modules/ecore_imf/xim/meson.build
+++ b/src/modules/ecore_imf/xim/meson.build
@@ -8,5 +8,6 @@ shared_module(mod_name,
     mod_src,
     dependencies: mod_deps,
     install: true,
-    install_dir : mod_install_dir
+    install_dir : mod_install_dir,
+    name_suffix : sys_mod_extension
 )

diff --git a/src/modules/ecore_wl2/engines/dmabuf/meson.build b/src/modules/ecore_wl2/engines/dmabuf/meson.build
index c6b976d..4b3ac53 100644 (file)
--- a/src/modules/ecore_wl2/engines/dmabuf/meson.build
+++ b/src/modules/ecore_wl2/engines/dmabuf/meson.build
@@ -2,5 +2,6 @@ shared_module('dmabuf',
     'ecore_wl2_surface_module_dmabuf.c',
     dependencies: [ecore_wl2, wayland_protocol],
     install: true,
-    install_dir : mod_install_dir
+    install_dir : mod_install_dir,
+    name_suffix : sys_mod_extension
 )

diff --git a/src/modules/eeze/sensor/fake/meson.build b/src/modules/eeze/sensor/fake/meson.build
index c87f2cb..f249542 100644 (file)
--- a/src/modules/eeze/sensor/fake/meson.build
+++ b/src/modules/eeze/sensor/fake/meson.build
@@ -3,6 +3,7 @@ shared_module(module_name,
     dependencies: [eina, eeze, ecore],
     install: true,
     install_dir : join_paths(dir_package_modules, 'sensor', module_name, version_name),
+    name_suffix : sys_mod_extension
 )
 
 module_files += join_paths(dir_package_modules, 'sensor', module_name, version_name, 'lib' + module_name + '.' + sys_lib_extension)

diff --git a/src/modules/eeze/sensor/udev/meson.build b/src/modules/eeze/sensor/udev/meson.build
index c87f2cb..f249542 100644 (file)
--- a/src/modules/eeze/sensor/udev/meson.build
+++ b/src/modules/eeze/sensor/udev/meson.build
@@ -3,6 +3,7 @@ shared_module(module_name,
     dependencies: [eina, eeze, ecore],
     install: true,
     install_dir : join_paths(dir_package_modules, 'sensor', module_name, version_name),
+    name_suffix : sys_mod_extension
 )
 
 module_files += join_paths(dir_package_modules, 'sensor', module_name, version_name, 'lib' + module_name + '.' + sys_lib_extension)

diff --git a/src/modules/elementary/access_output/meson.build b/src/modules/elementary/access_output/meson.build
index 178ab16..f949d07 100644 (file)
--- a/src/modules/elementary/access_output/meson.build
+++ b/src/modules/elementary/access_output/meson.build
@@ -6,5 +6,6 @@ shared_module(mod,
     src,
     dependencies: [elementary],
     install: true,
-    install_dir : mod_install_dir
+    install_dir : mod_install_dir,
+    name_suffix : sys_mod_extension
 )

diff --git a/src/modules/elementary/prefs/meson.build b/src/modules/elementary/prefs/meson.build
index 9ec2c9a..f36adf2 100644 (file)
--- a/src/modules/elementary/prefs/meson.build
+++ b/src/modules/elementary/prefs/meson.build
@@ -20,5 +20,6 @@ shared_module(mod,
     src,
     dependencies: [elementary],
     install: true,
-    install_dir : mod_install_dir
+    install_dir : mod_install_dir,
+    name_suffix : sys_mod_extension
 )

diff --git a/src/modules/elementary/test_entry/meson.build b/src/modules/elementary/test_entry/meson.build
index 178ab16..f949d07 100644 (file)
--- a/src/modules/elementary/test_entry/meson.build
+++ b/src/modules/elementary/test_entry/meson.build
@@ -6,5 +6,6 @@ shared_module(mod,
     src,
     dependencies: [elementary],
     install: true,
-    install_dir : mod_install_dir
+    install_dir : mod_install_dir,
+    name_suffix : sys_mod_extension
 )

diff --git a/src/modules/elementary/test_map/meson.build b/src/modules/elementary/test_map/meson.build
index 178ab16..f949d07 100644 (file)
--- a/src/modules/elementary/test_map/meson.build
+++ b/src/modules/elementary/test_map/meson.build
@@ -6,5 +6,6 @@ shared_module(mod,
     src,
     dependencies: [elementary],
     install: true,
-    install_dir : mod_install_dir
+    install_dir : mod_install_dir,
+    name_suffix : sys_mod_extension
 )

diff --git a/src/modules/elementary/web/none/meson.build b/src/modules/elementary/web/none/meson.build
index 632bca3..5e324a8 100644 (file)
--- a/src/modules/elementary/web/none/meson.build
+++ b/src/modules/elementary/web/none/meson.build
@@ -6,7 +6,8 @@ shared_module('none',
     src,
     dependencies: [elementary, elementary_deps],
     install: true,
-    install_dir : mod_install_dir
+    install_dir : mod_install_dir,
+    name_suffix : sys_mod_extension
 )
 
 mod = 'none'

diff --git a/src/modules/emotion/gstreamer1/meson.build b/src/modules/emotion/gstreamer1/meson.build
index aae7f5f..5d09a46 100644 (file)
--- a/src/modules/emotion/gstreamer1/meson.build
+++ b/src/modules/emotion/gstreamer1/meson.build
@@ -22,4 +22,5 @@ shared_module(emotion_loader,
     install: true,
     install_dir : mod_install_dir,
     c_args : package_c_args,
+    name_suffix : sys_mod_extension
 )

diff --git a/src/modules/ethumb/emotion/meson.build b/src/modules/ethumb/emotion/meson.build
index f85b573..0bbd939 100644 (file)
--- a/src/modules/ethumb/emotion/meson.build
+++ b/src/modules/ethumb/emotion/meson.build
@@ -31,4 +31,5 @@ shared_module(emotion_loader+'_el',
   install: true,
   install_dir : mod_install_dir,
   c_args : package_c_args,
+  name_suffix : sys_mod_extension
 )