commit: 83353a2bfaa32fa2a5988496eb99674f711849cd Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Mon Nov 7 16:14:40 2022 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Mon Nov 7 16:14:40 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83353a2b
sys-apps/systemd: backport fix for meson-0.64 Bug: https://bugs.gentoo.org/879141 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> sys-apps/systemd/files/251-meson-0.64.patch | 26 ++++++++++++++++++++++++++ sys-apps/systemd/systemd-251.7.ebuild | 1 + 2 files changed, 27 insertions(+) diff --git a/sys-apps/systemd/files/251-meson-0.64.patch b/sys-apps/systemd/files/251-meson-0.64.patch new file mode 100644 index 000000000000..6cc200bbd87d --- /dev/null +++ b/sys-apps/systemd/files/251-meson-0.64.patch @@ -0,0 +1,26 @@ +From cddbc850270415a818aadabd71fe12dc0dddd508 Mon Sep 17 00:00:00 2001 +From: Jan Janssen <medhe...@web.de> +Date: Sun, 9 Oct 2022 17:16:12 +0200 +Subject: [PATCH] meson: Fix build with --optimization=plain + +Note that -O0 is deliberately filtered out as we have to compile with at +least -O1 due to #24202. + +Fixes: #24323 +--- + src/boot/efi/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build +index e0cd4ebad993..395386d3eda7 100644 +--- a/src/boot/efi/meson.build ++++ b/src/boot/efi/meson.build +@@ -223,7 +223,7 @@ endif + if get_option('debug') and get_option('mode') == 'developer' + efi_cflags += ['-ggdb', '-DEFI_DEBUG'] + endif +-if get_option('optimization') != '0' ++if get_option('optimization') in ['1', '2', '3', 's', 'g'] + efi_cflags += ['-O' + get_option('optimization')] + endif + if get_option('b_ndebug') == 'true' or ( diff --git a/sys-apps/systemd/systemd-251.7.ebuild b/sys-apps/systemd/systemd-251.7.ebuild index de8a975e58e1..b08e49db559d 100644 --- a/sys-apps/systemd/systemd-251.7.ebuild +++ b/sys-apps/systemd/systemd-251.7.ebuild @@ -239,6 +239,7 @@ src_prepare() { # bug #841770. "${FILESDIR}/251-revert-fortify-source-3-fix.patch" "${FILESDIR}/251-gpt-auto-no-cryptsetup.patch" + "${FILESDIR}/251-meson-0.64.patch" ) if ! use vanilla; then
