summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2020-04-06 11:41:28 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2020-04-07 10:58:17 +0200
commit44a33c2dad59b4fd18964415f3a4a3a479772e0f (patch)
tree9a202fd8fb523f473d2d466f2e882d4fcf295c40
parentc9f9582753b9e0c4091af544a2be54ee2fdea70f (diff)
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
-rw-r--r--src/edje_external/elementary/meson.build1
-rw-r--r--src/edje_external/emotion/meson.build3
-rw-r--r--src/modules/ecore/system/systemd/meson.build1
-rw-r--r--src/modules/ecore/system/tizen/meson.build1
-rw-r--r--src/modules/ecore/system/upower/meson.build1
-rw-r--r--src/modules/ecore_buffer/shm/meson.build3
-rw-r--r--src/modules/ecore_buffer/x11_dri2/meson.build3
-rw-r--r--src/modules/ecore_buffer/x11_dri3/meson.build3
-rw-r--r--src/modules/ecore_imf/ibus/meson.build3
-rw-r--r--src/modules/ecore_imf/scim/meson.build3
-rw-r--r--src/modules/ecore_imf/wayland/meson.build3
-rw-r--r--src/modules/ecore_imf/xim/meson.build3
-rw-r--r--src/modules/ecore_wl2/engines/dmabuf/meson.build3
-rw-r--r--src/modules/eeze/sensor/fake/meson.build1
-rw-r--r--src/modules/eeze/sensor/udev/meson.build1
-rw-r--r--src/modules/elementary/access_output/meson.build3
-rw-r--r--src/modules/elementary/prefs/meson.build3
-rw-r--r--src/modules/elementary/test_entry/meson.build3
-rw-r--r--src/modules/elementary/test_map/meson.build3
-rw-r--r--src/modules/elementary/web/none/meson.build3
-rw-r--r--src/modules/emotion/gstreamer1/meson.build1
-rw-r--r--src/modules/ethumb/emotion/meson.build1
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',
46 install: true, 46 install: true,
47 install_dir: mod_install_dir, 47 install_dir: mod_install_dir,
48 c_args : elm_package_c_args, 48 c_args : elm_package_c_args,
49 name_suffix : sys_mod_extension
49) 50)
50module_files += join_paths(mod_install_dir, 'libelementary.' + sys_mod_extension) 51module_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',
3 dependencies: [edje, emotion], 3 dependencies: [edje, emotion],
4 install: true, 4 install: true,
5 install_dir: mod_install_dir, 5 install_dir: mod_install_dir,
6 c_args : emotion_package_c_args 6 c_args : emotion_package_c_args,
7 name_suffix : sys_mod_extension
7) 8)
8module_files += join_paths(mod_install_dir, 'libemotion.' + sys_mod_extension) 9module_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')
4 dependencies: [ecore, eldbus], 4 dependencies: [ecore, eldbus],
5 install: true, 5 install: true,
6 install_dir: mod_install_dir, 6 install_dir: mod_install_dir,
7 name_suffix : sys_mod_extension
7 ) 8 )
8 module_files += join_paths(mod_install_dir, 'libsystemd.' + sys_mod_extension) 9 module_files += join_paths(mod_install_dir, 'libsystemd.' + sys_mod_extension)
9endif 10endif
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',
3 dependencies: [ecore, eldbus], 3 dependencies: [ecore, eldbus],
4 install: true, 4 install: true,
5 install_dir: mod_install_dir, 5 install_dir: mod_install_dir,
6 name_suffix : sys_mod_extension
6) 7)
7module_files += join_paths(mod_install_dir, 'libtizen.' + sys_mod_extension) 8module_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',
3 dependencies: [ecore, eldbus], 3 dependencies: [ecore, eldbus],
4 install: true, 4 install: true,
5 install_dir: mod_install_dir, 5 install_dir: mod_install_dir,
6 name_suffix : sys_mod_extension
6) 7)
7module_files += join_paths(mod_install_dir, 'libupower.' + sys_mod_extension) 8module_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',
3 name_prefix: '', 3 name_prefix: '',
4 dependencies: [ecore, ecore_buffer], 4 dependencies: [ecore, ecore_buffer],
5 install: true, 5 install: true,
6 install_dir: join_paths(dir_lib, 'ecore_buffer', 'modules', 'shm', version_name) 6 install_dir: join_paths(dir_lib, 'ecore_buffer', 'modules', 'shm', version_name),
7 name_suffix : sys_mod_extension
7) 8)
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',
3 name_prefix: '', 3 name_prefix: '',
4 dependencies: [ecore, ecore_buffer, ecore_x], 4 dependencies: [ecore, ecore_buffer, ecore_x],
5 install: true, 5 install: true,
6 install_dir: join_paths(dir_lib, 'ecore_buffer', 'modules', 'x11_dri2', version_name) 6 install_dir: join_paths(dir_lib, 'ecore_buffer', 'modules', 'x11_dri2', version_name),
7 name_suffix : sys_mod_extension
7) 8)
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'
4 name_prefix: '', 4 name_prefix: '',
5 dependencies: [ecore, ecore_buffer, ecore_x], 5 dependencies: [ecore, ecore_buffer, ecore_x],
6 install: true, 6 install: true,
7 install_dir: join_paths(dir_lib, 'ecore_buffer', 'modules', 'x11_dri3', version_name) 7 install_dir: join_paths(dir_lib, 'ecore_buffer', 'modules', 'x11_dri3', version_name),
8 name_suffix : sys_mod_extension
8 ) 9 )
9endif 10endif
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,
10 mod_src, 10 mod_src,
11 dependencies: mod_deps, 11 dependencies: mod_deps,
12 install: true, 12 install: true,
13 install_dir : mod_install_dir 13 install_dir : mod_install_dir,
14 name_suffix : sys_mod_extension
14) 15)
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,
15 mod_src, 15 mod_src,
16 dependencies: mod_deps, 16 dependencies: mod_deps,
17 install: true, 17 install: true,
18 install_dir : mod_install_dir 18 install_dir : mod_install_dir,
19 name_suffix : sys_mod_extension
19) 20)
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,
12 mod_src, 12 mod_src,
13 dependencies: mod_deps, 13 dependencies: mod_deps,
14 install: true, 14 install: true,
15 install_dir : mod_install_dir 15 install_dir : mod_install_dir,
16 name_suffix : sys_mod_extension
16) 17)
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,
8 mod_src, 8 mod_src,
9 dependencies: mod_deps, 9 dependencies: mod_deps,
10 install: true, 10 install: true,
11 install_dir : mod_install_dir 11 install_dir : mod_install_dir,
12 name_suffix : sys_mod_extension
12) 13)
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',
2 'ecore_wl2_surface_module_dmabuf.c', 2 'ecore_wl2_surface_module_dmabuf.c',
3 dependencies: [ecore_wl2, wayland_protocol], 3 dependencies: [ecore_wl2, wayland_protocol],
4 install: true, 4 install: true,
5 install_dir : mod_install_dir 5 install_dir : mod_install_dir,
6 name_suffix : sys_mod_extension
6) 7)
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,
3 dependencies: [eina, eeze, ecore], 3 dependencies: [eina, eeze, ecore],
4 install: true, 4 install: true,
5 install_dir : join_paths(dir_package_modules, 'sensor', module_name, version_name), 5 install_dir : join_paths(dir_package_modules, 'sensor', module_name, version_name),
6 name_suffix : sys_mod_extension
6) 7)
7 8
8module_files += join_paths(dir_package_modules, 'sensor', module_name, version_name, 'lib' + module_name + '.' + sys_lib_extension) 9module_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,
3 dependencies: [eina, eeze, ecore], 3 dependencies: [eina, eeze, ecore],
4 install: true, 4 install: true,
5 install_dir : join_paths(dir_package_modules, 'sensor', module_name, version_name), 5 install_dir : join_paths(dir_package_modules, 'sensor', module_name, version_name),
6 name_suffix : sys_mod_extension
6) 7)
7 8
8module_files += join_paths(dir_package_modules, 'sensor', module_name, version_name, 'lib' + module_name + '.' + sys_lib_extension) 9module_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,
6 src, 6 src,
7 dependencies: [elementary], 7 dependencies: [elementary],
8 install: true, 8 install: true,
9 install_dir : mod_install_dir 9 install_dir : mod_install_dir,
10 name_suffix : sys_mod_extension
10) 11)
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,
20 src, 20 src,
21 dependencies: [elementary], 21 dependencies: [elementary],
22 install: true, 22 install: true,
23 install_dir : mod_install_dir 23 install_dir : mod_install_dir,
24 name_suffix : sys_mod_extension
24) 25)
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,
6 src, 6 src,
7 dependencies: [elementary], 7 dependencies: [elementary],
8 install: true, 8 install: true,
9 install_dir : mod_install_dir 9 install_dir : mod_install_dir,
10 name_suffix : sys_mod_extension
10) 11)
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,
6 src, 6 src,
7 dependencies: [elementary], 7 dependencies: [elementary],
8 install: true, 8 install: true,
9 install_dir : mod_install_dir 9 install_dir : mod_install_dir,
10 name_suffix : sys_mod_extension
10) 11)
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',
6 src, 6 src,
7 dependencies: [elementary, elementary_deps], 7 dependencies: [elementary, elementary_deps],
8 install: true, 8 install: true,
9 install_dir : mod_install_dir 9 install_dir : mod_install_dir,
10 name_suffix : sys_mod_extension
10) 11)
11 12
12mod = 'none' 13mod = '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,
22 install: true, 22 install: true,
23 install_dir : mod_install_dir, 23 install_dir : mod_install_dir,
24 c_args : package_c_args, 24 c_args : package_c_args,
25 name_suffix : sys_mod_extension
25) 26)
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',
29 install: true, 29 install: true,
30 install_dir : mod_install_dir, 30 install_dir : mod_install_dir,
31 c_args : package_c_args, 31 c_args : package_c_args,
32 name_suffix : sys_mod_extension
32) 33)