commit: 3fc4b39346b5346d6368a729a02ba7b1b9bf3ccb Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Nov 3 23:53:45 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Nov 3 23:57:34 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fc4b393
sys-apps/systemd-tmpfiles: fix build with meson-0.60 Closes: https://bugs.gentoo.org/821547 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/systemd-tmpfiles-249.2-meson-0.60.patch | 26 ++++++++++++++++++++++ .../systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild | 1 + 2 files changed, 27 insertions(+) diff --git a/sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-249.2-meson-0.60.patch b/sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-249.2-meson-0.60.patch new file mode 100644 index 00000000000..b931912be23 --- /dev/null +++ b/sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-249.2-meson-0.60.patch @@ -0,0 +1,26 @@ +https://github.com/systemd/systemd/commit/c29537f39e4f413a6cbfe9669fa121bdd6d8b36f +https://bugs.gentoo.org/821547 + +From: Dan Streetman <ddstr...@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 +--- 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 + + diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild index a651892d8e0..ad80dc82cf8 100644 --- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild +++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild @@ -62,6 +62,7 @@ S="${WORKDIR}/${MY_PN}-${PV}" PATCHES=( # backport from 250 to silence musl warnings "${FILESDIR}/249-sys-include-posix.patch" + "${FILESDIR}/${P}-meson-0.60.patch" ) python_check_deps() {
