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 <stefan@datenfreihafen.org>
Differential Revision: https://phab.enlightenment.org/D7896
This commit is contained in:
Marcel Hollerbach 2019-02-07 15:35:58 +01:00 committed by Stefan Schmidt
parent a2101a5c00
commit b805f11c89
2 changed files with 6 additions and 2 deletions

View File

@ -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)

View File

@ -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