diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-12-25 20:34:27 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-12-25 20:34:27 +0000 |
| commit | 0f15659d48c193027158492acb726297501202c5 (patch) | |
| tree | 5502ba879a78b759da28441d418dbbfe08bd8f03 /sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-249.2-meson-0.60.patch | |
| parent | 93a93e9a3b53c1a73142a305ea1f8136846942ee (diff) | |
gentoo xmass resync : 25.12.2021
Diffstat (limited to 'sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-249.2-meson-0.60.patch')
| -rw-r--r-- | sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-249.2-meson-0.60.patch | 26 |
1 files changed, 0 insertions, 26 deletions
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 deleted file mode 100644 index b931912be23e..000000000000 --- a/sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-249.2-meson-0.60.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/systemd/systemd/commit/c29537f39e4f413a6cbfe9669fa121bdd6d8b36f -https://bugs.gentoo.org/821547 - -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 ---- 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 - - |