diff --git a/debian/patches/meson.build-change-operator-combining-bools-from-to-and.patch b/debian/patches/meson.build-change-operator-combining-bools-from-to-and.patch new file mode 100644 index 0000000000000000000000000000000000000000..5a3fb9863943c8fa12b109af19bc2ec32beaa036 --- /dev/null +++ b/debian/patches/meson.build-change-operator-combining-bools-from-to-and.patch @@ -0,0 +1,32 @@ +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 + diff --git a/debian/patches/series b/debian/patches/series index 6e1ed553804f56defc15b6663a71f869dea5af9e..3df9f030ce4ad82a9a883ff1b85484d816ce71b6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -41,3 +41,4 @@ apertis/kernel-install-allow-to-create-BOOT-MACHINE_ID.patch apertis/Fix-the-path-to-bootable-binaries-in-efi-entry.patch apertis/basic-linux-Sync-if_arp.h-with-Linux-5.14.patch apertis/systemd-journal-flush-Add-a-requirement-on-var.mount.patch +meson.build-change-operator-combining-bools-from-to-and.patch