From: Marcel Hollerbach Date: Thu, 7 Feb 2019 14:35:58 +0000 (+0100) Subject: build: next attempt to fix build race condition X-Git-Tag: submit/tizen/20190211.061543^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=909f59e7ac15b42a25897a848eab86818220ed14;p=platform%2Fupstream%2Fefl.git build: next attempt to fix build race condition the source should be used in the dependency. However, only the generated header source, not the .c files or we will get duplicated sources. This is another attempt to fix the build OSX travis failure Reviewed-by: Stefan Schmidt Differential Revision: https://phab.enlightenment.org/D7896 --- diff --git a/src/modules/evas/engines/software_generic/meson.build b/src/modules/evas/engines/software_generic/meson.build index ef49982..4d52667 100644 --- a/src/modules/evas/engines/software_generic/meson.build +++ b/src/modules/evas/engines/software_generic/meson.build @@ -9,6 +9,7 @@ engine_src = files([ 'evas_ector_software.h', ]) +gen_src = [] pub_eo_files = [ 'evas_ector_software_buffer.eo' @@ -17,7 +18,7 @@ pub_eo_files = [ subdir('filters') foreach eo_file : pub_eo_files - engine_src += custom_target('eolian_gen_' + eo_file, + gen_src += custom_target('eolian_gen_' + eo_file, input : eo_file, output : [eo_file + '.h'], depfile : eo_file + '.d', @@ -28,6 +29,8 @@ foreach eo_file : pub_eo_files '-gchd', '@INPUT@']) endforeach +engine_src += gen_src + engine_deps = [draw, dl] if get_option('evas-modules') == 'shared' and not evas_force_static.contains(engine) diff --git a/src/modules/evas/meson.build b/src/modules/evas/meson.build index 964edbf..8ad6aaf 100644 --- a/src/modules/evas/meson.build +++ b/src/modules/evas/meson.build @@ -70,7 +70,8 @@ foreach engine_conf : engines if engine == 'software_generic' software_generic = declare_dependency( include_directories: engine_include_dir, - source : engine_src, + sources : gen_src, + dependencies : [eina, evas_pre] + engine_deps, link_with : tmp ) endif