Forked from
pkg / systemd
56 commits behind the upstream repository.
-
Dylan Aïssi authoredThese patches are specific to Apertis because a new version of meson has been backported to Apertis. Signed-off-by:
Dylan Aïssi <dylan.aissi@collabora.com>Dylan Aïssi authoredThese patches are specific to Apertis because a new version of meson has been backported to Apertis. Signed-off-by:Dylan Aïssi <dylan.aissi@collabora.com>
meson.build-change-operator-combining-bools-from-to-and.patch 981 B
From c29537f39e4f413a6cbfe9669fa121bdd6d8b36f Mon Sep 17 00:00:00 2001
From: Dan Streetman <ddstreet@canonical.com>
Date: Fri, 3 Sep 2021 12:43:33 -0400
Subject: [PATCH] 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
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 6e1a8b1e50..0fe996adba 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
--
2.30.2