From df93e8ef0544ad11dcafd0837d4d72b4f4b0b5bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 5 Jan 2019 13:20:37 +0100 Subject: [PATCH 1/2] meson: declare version.h as dep for libbasic "meson build && ninja -C build systemd-cat" would fail on missing version.h. Fixes #11335. --- src/basic/meson.build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/basic/meson.build b/src/basic/meson.build index 95a0d45450..349957f215 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build @@ -216,6 +216,8 @@ basic_sources = files(''' xattr-util.h '''.split()) +basic_sources += version_h + missing_audit_h = files('missing_audit.h') missing_capability_h = files('missing_capability.h') missing_network_h = files('missing_network.h') From 63058f432b408b89937bd22a2d51e22b3ad57322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 5 Jan 2019 13:20:52 +0100 Subject: [PATCH 2/2] Revert "meson: declare version.h as dep for fuzzers" This reverts commit 0c2e93b863f8ec164e7e9e119ab127a752cb1331. This should not be necessary anymore after previous commit. I don't quite remember what sequence of steps was failing, but right now "meson build -Dslow-tests=true && ninja -C build fuzzers" work fine. --- meson.build | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 5dd105f097..93e78ef57c 100644 --- a/meson.build +++ b/meson.build @@ -2899,9 +2899,8 @@ foreach tuple : fuzzers endforeach endif -run_target( - 'fuzzers', - depends : [fuzzer_exes, version_h], +run_target('fuzzers', + depends : fuzzer_exes, command : ['true']) ############################################################