From: Dan Streetman <ddstreet@canonical.com>
Date: Fri, 3 Sep 2021 16:43:33 +0000 (-0400)
Subject: meson.build: change operator combining bools from + to and
X-Git-Tag: v250-rc1~731
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c29537f39e4f413a6cbfe9669fa121bdd6d8b36f;p=thirdparty%2Fsystemd.git

meson.build: change operator combining bools from + to and

upstream meson stopped allowing combining boolean with the plus
operator, and now requires using the logical and operator

reference:
https://github.com/mesonbuild/meson/commit/43302d3296baff6aeaf8e03f5d701b0402e37a6c

Fixes: #20632
---

diff --git a/meson.build b/meson.build
index 6e1a8b1e50e..0fe996adba2 100644
--- a/meson.build
+++ b/meson.build
@@ -35,7 +35,7 @@ conf.set10('BUILD_MODE_DEVELOPER', get_option('mode') == 'developer',
 
 want_ossfuzz = get_option('oss-fuzz')
 want_libfuzzer = get_option('llvm-fuzz')
-if want_ossfuzz + want_libfuzzer > 1
+if want_ossfuzz and want_libfuzzer
         error('only one of oss-fuzz or llvm-fuzz can be specified')
 endif