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
This commit is contained in:
parent
7543db4d3c
commit
30a7446d9c
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
)
|
||||
|
|
|
@ -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
|
||||
)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
)
|
||||
|
|
|
@ -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
|
||||
)
|
||||
|
|
|
@ -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
|
||||
)
|
||||
|
|
|
@ -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
|
||||
)
|
||||
|
|
|
@ -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
|
||||
)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
)
|
||||
|
|
|
@ -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
|
||||
)
|
||||
|
|
|
@ -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
|
||||
)
|
||||
|
|
|
@ -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
|
||||
)
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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
|
||||
)
|
||||
|
|
|
@ -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
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue