Skip to content

Commit 604e0b5

Browse files
authored
meson: fix some implicit ordering dependencies on generated headers (#716)
Given sufficiently high or simply random parallelism, it was possible to build various source files that included this generated header, without having coincidentally built the header previously. It then failed to compile, since there was no actual guarantee the header would come first. Add explicit header-only dependencies by adding the header as additional sources to targets that draw it in. Fixes: ``` * QA Notice: missing ninja dependencies in /var/tmp/portage/x11-wm/muffin-6.4.1/work/muffin-6.4.1-build: [...] * Processed 517 nodes. * Error: There are 249 missing dependency paths. * 249 targets had depfile dependencies on 1 distinct generated inputs (from 1 rules) without a non-depfile dep path to the generator. * There might be build flakiness if any of the targets listed above are built alone, or not late enough, in a clean output directory. ``` Signed-off-by: Eli Schwartz <[email protected]>
1 parent bc449de commit 604e0b5

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

clutter/clutter/meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,7 @@ libmutter_clutter = shared_library(libmutter_clutter_name,
421421
cally_sources,
422422
cally_headers,
423423
cally_private_headers,
424+
libmutter_cogl_path_enum_types_h
424425
],
425426
version: '0.0.0',
426427
soversion: 0,

src/compositor/plugins/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ default_plugin_c_args = [
55
]
66

77
default_plugin = shared_module('default',
8-
sources: ['default.c'],
8+
sources: ['default.c', libmutter_cogl_path_enum_types_h],
99
include_directories: mutter_includes,
1010
c_args: default_plugin_c_args,
1111
dependencies: [

src/meson.build

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -903,6 +903,7 @@ libmutter = shared_library(libmutter_name,
903903
sources: [
904904
mutter_sources,
905905
mutter_built_sources,
906+
libmutter_cogl_path_enum_types_h,
906907
],
907908
version: '0.0.0',
908909
soversion: 0,
@@ -933,6 +934,7 @@ libmutter_dep = declare_dependency(
933934
executable('muffin',
934935
sources: [
935936
files('core/mutter.c'),
937+
libmutter_cogl_path_enum_types_h,
936938
],
937939
include_directories: mutter_includes,
938940
c_args: mutter_c_args,

0 commit comments

Comments
 (0)