summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-02-07 15:35:58 +0100
committerStefan Schmidt <s.schmidt@samsung.com>2019-02-08 15:48:02 +0100
commitb805f11c89ae5a43b6e74bfe2856beb35483a182 (patch)
tree1f2206c107a2e14c7480988823c52dc3c7f3b5ee
parenta2101a5c0018328d2d994b06562f14b22fb05d70 (diff)
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
-rw-r--r--src/modules/evas/engines/software_generic/meson.build5
-rw-r--r--src/modules/evas/meson.build3
2 files changed, 6 insertions, 2 deletions
diff --git a/src/modules/evas/engines/software_generic/meson.build b/src/modules/evas/engines/software_generic/meson.build
index ef499821e8..4d52667838 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([
9 'evas_ector_software.h', 9 'evas_ector_software.h',
10]) 10])
11 11
12gen_src = []
12 13
13pub_eo_files = [ 14pub_eo_files = [
14 'evas_ector_software_buffer.eo' 15 'evas_ector_software_buffer.eo'
@@ -17,7 +18,7 @@ pub_eo_files = [
17subdir('filters') 18subdir('filters')
18 19
19foreach eo_file : pub_eo_files 20foreach eo_file : pub_eo_files
20 engine_src += custom_target('eolian_gen_' + eo_file, 21 gen_src += custom_target('eolian_gen_' + eo_file,
21 input : eo_file, 22 input : eo_file,
22 output : [eo_file + '.h'], 23 output : [eo_file + '.h'],
23 depfile : eo_file + '.d', 24 depfile : eo_file + '.d',
@@ -28,6 +29,8 @@ foreach eo_file : pub_eo_files
28 '-gchd', '@INPUT@']) 29 '-gchd', '@INPUT@'])
29endforeach 30endforeach
30 31
32engine_src += gen_src
33
31engine_deps = [draw, dl] 34engine_deps = [draw, dl]
32 35
33if get_option('evas-modules') == 'shared' and not evas_force_static.contains(engine) 36if 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 11c860c469..e8cafcc9fa 100644
--- a/src/modules/evas/meson.build
+++ b/src/modules/evas/meson.build
@@ -70,7 +70,8 @@ foreach engine_conf : engines
70 if engine == 'software_generic' 70 if engine == 'software_generic'
71 software_generic = declare_dependency( 71 software_generic = declare_dependency(
72 include_directories: engine_include_dir, 72 include_directories: engine_include_dir,
73 source : engine_src, 73 sources : gen_src,
74 dependencies : [eina, evas_pre] + engine_deps,
74 link_with : tmp 75 link_with : tmp
75 ) 76 )
76 endif 77 endif