bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e1f3a4232e65c487dcbb4d62206a8181959e712d
commit e1f3a4232e65c487dcbb4d62206a8181959e712d Author: Marcel Hollerbach <[email protected]> Date: Wed Jan 30 14:48:04 2019 +0100 meson: fix race condition in building this came up on travis with osx. However, it should hit everyone, and its questionable why it did not happened ever before. Differential Revision: https://phab.enlightenment.org/D7831 --- src/modules/evas/engines/gl_generic/meson.build | 2 +- src/modules/evas/meson.build | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/modules/evas/engines/gl_generic/meson.build b/src/modules/evas/engines/gl_generic/meson.build index 8926f24127..c9957d4923 100644 --- a/src/modules/evas/engines/gl_generic/meson.build +++ b/src/modules/evas/engines/gl_generic/meson.build @@ -39,7 +39,7 @@ engine_include_dir = include_directories(join_paths('..','software_generic')) if get_option('evas-modules') == 'shared' and not evas_force_static.contains(engine) shared_module(mod_full_name, engine_src, include_directories : config_dir + [engine_include_dir], - dependencies : [eina, evas_pre] + engine_deps, + dependencies : [eina, evas_pre] + engine_deps + [software_generic], install : true, install_dir : mod_install_dir, name_suffix : sys_mod_extension diff --git a/src/modules/evas/meson.build b/src/modules/evas/meson.build index e97ff1b2a0..fff385bc01 100644 --- a/src/modules/evas/meson.build +++ b/src/modules/evas/meson.build @@ -67,6 +67,12 @@ foreach engine_conf : engines dependencies : [eina, evas_pre] + engine_deps, ) + if engine == 'software_generic' + software_generic = declare_dependency( + include_directories: engine_include_dir, + link_with : tmp + ) + endif if engine == 'gl_common' #gl_common will only be used by gl_generic, NOT by libevas.so, so we work arround the static list gl_common = declare_dependency( --
