diff options
author | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2020-04-06 11:41:28 +0200 |
---|---|---|
committer | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2020-04-07 10:14:01 +0200 |
commit | 30a7446d9c3c09eb58ab93e754efc69fa9fba940 (patch) | |
tree | 0836af36179609f2b056bbcf527b362385c4b102 | |
parent | 7543db4d3caff94889569a2775b61bf8d5217506 (diff) | |
download | efl-30a7446d9c3c09eb58ab93e754efc69fa9fba940.tar.gz |
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.
Differential Revision: https://phab.enlightenment.org/D11650
22 files changed, 36 insertions, 14 deletions
diff --git a/src/edje_external/elementary/meson.build b/src/edje_external/elementary/meson.build index 383ab77d8b..033b54eab8 100644 --- 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 63e6ff82a0..5d869d8b7a 100644 --- 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 7649611255..2a1104ca6a 100644 --- 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 78c7640e4b..8d9db22661 100644 --- 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 ea1a20bec1..b579bed76d 100644 --- 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 baf9a0fc5a..80c0a796de 100644 --- 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 b63823b3bc..34cca89916 100644 --- 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 e3a7dd18e4..ce89219b53 100644 --- 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 f81543974b..57bc90f528 100644 --- 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 9356a00526..6f67ebc69d 100644 --- 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 f49cc3f0fb..80832cad37 100644 --- 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 4ffa1f177c..d5411c77d9 100644 --- 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 c6b976daca..4b3ac53daf 100644 --- 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 c87f2cb68d..f2495423db 100644 --- 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 c87f2cb68d..f2495423db 100644 --- 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 178ab16618..f949d07671 100644 --- 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 9ec2c9a475..f36adf2965 100644 --- 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 178ab16618..f949d07671 100644 --- 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 178ab16618..f949d07671 100644 --- 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 632bca3bc4..5e324a88cd 100644 --- 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 aae7f5f8ea..5d09a46b90 100644 --- 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 3ef9d4b12d..610b9e9e7c 100644 --- a/src/modules/ethumb/emotion/meson.build +++ b/src/modules/ethumb/emotion/meson.build @@ -29,4 +29,5 @@ shared_module(emotion_loader+'_el', install: true, install_dir : mod_install_dir, c_args : package_c_args, + name_suffix : sys_mod_extension ) |