From 5996740a090b6f45f8545ef29583c88800681d0b Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Sun, 11 Nov 2018 11:27:35 +0100 Subject: [PATCH 1/2] meson: don't build fuzzers if tests are disabled Fuzzers are just special tests anyways and without this, building with '-Dtests=false' fails with: .../src/fuzz/fuzz-main.c:20: undefined reference to `test_setup_logging' --- meson.build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meson.build b/meson.build index 76add43146..78be291ae6 100644 --- a/meson.build +++ b/meson.build @@ -2768,6 +2768,7 @@ endif fuzzer_exes = [] +if get_option('tests') != 'false' foreach tuple : fuzzers sources = tuple[0] link_with = tuple[1].length() > 0 ? tuple[1] : [libshared] @@ -2792,6 +2793,7 @@ foreach tuple : fuzzers c_args : defs, install : false) endforeach +endif run_target('fuzzers', depends : fuzzer_exes, From be5536a6afdc610aa0eb2178e579157cb63336e7 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Sun, 11 Nov 2018 11:30:53 +0100 Subject: [PATCH 2/2] meson: fix building with -Ddns-over-tls=false Assigning multiple variables in one line is no valid meson syntax. Without this running meson with -Ddns-over-tls=false fails with: meson.build:1191:8: ERROR: Tried to assign an invalid value to variable. --- meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 78be291ae6..d3cea0cfdf 100644 --- a/meson.build +++ b/meson.build @@ -1188,7 +1188,9 @@ if dns_over_tls != 'false' endif have = have_gnutls or have_openssl else - have = have_gnutls = have_openssl = false + have = false + have_gnutls = false + have_openssl = false endif conf.set10('ENABLE_DNS_OVER_TLS', have) conf.set10('DNS_OVER_TLS_USE_GNUTLS', have_gnutls)