From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/, sys-apps/systemd-utils/files/
Date: Sun, 6 Nov 2022 03:22:29 +0000 (UTC) [thread overview]
Message-ID: <1667704920.932a4a03a9e7f147dd4aabbefae58dcafa77ff32.floppym@gentoo> (raw)
commit: 932a4a03a9e7f147dd4aabbefae58dcafa77ff32
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 6 03:22:00 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Nov 6 03:22:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=932a4a03
sys-apps/systemd-utils: fix build with meson-0.64
Closes: https://bugs.gentoo.org/879141
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd-utils/files/251-meson-0.64.patch | 26 +++++++++++++++++++++++
sys-apps/systemd-utils/systemd-utils-251.7.ebuild | 1 +
2 files changed, 27 insertions(+)
diff --git a/sys-apps/systemd-utils/files/251-meson-0.64.patch b/sys-apps/systemd-utils/files/251-meson-0.64.patch
new file mode 100644
index 000000000000..6cc200bbd87d
--- /dev/null
+++ b/sys-apps/systemd-utils/files/251-meson-0.64.patch
@@ -0,0 +1,26 @@
+From cddbc850270415a818aadabd71fe12dc0dddd508 Mon Sep 17 00:00:00 2001
+From: Jan Janssen <medhefgo@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-utils/systemd-utils-251.7.ebuild b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
index 46a55e226ca4..3f1741e3035d 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
@@ -108,6 +108,7 @@ src_prepare() {
# Breaks Clang. Revert the commit for now and force off F_S=3.
"${FILESDIR}/251-revert-fortify-source-3-fix.patch"
"${FILESDIR}/251-gpt-auto-no-cryptsetup.patch"
+ "${FILESDIR}/251-meson-0.64.patch"
)
if use elibc_musl; then
next reply other threads:[~2022-11-06 3:22 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-06 3:22 Mike Gilbert [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-06-07 18:06 [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/, sys-apps/systemd-utils/files/ Mike Gilbert
2023-05-10 0:54 Sam James
2023-01-28 2:47 Mike Gilbert
2023-01-13 20:06 Mike Gilbert
2023-01-11 7:50 Sam James
2022-11-21 16:14 Mike Gilbert
2022-09-18 15:52 Mike Gilbert
2022-08-02 23:40 Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1667704920.932a4a03a9e7f147dd4aabbefae58dcafa77ff32.floppym@gentoo \
--to=floppym@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox