diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2022-11-05 23:22:00 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2022-11-05 23:22:00 -0400 |
| commit | 932a4a03a9e7f147dd4aabbefae58dcafa77ff32 (patch) | |
| tree | 3a80548c7169a08a69a3e2783502145324fb889a | |
| parent | sys-libs/ncurses: restore keywords for libcurses-less version (diff) | |
| download | gentoo-932a4a03a9e7f147dd4aabbefae58dcafa77ff32.tar.gz gentoo-932a4a03a9e7f147dd4aabbefae58dcafa77ff32.tar.bz2 gentoo-932a4a03a9e7f147dd4aabbefae58dcafa77ff32.zip | |
sys-apps/systemd-utils: fix build with meson-0.64
Closes: https://bugs.gentoo.org/879141
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
| -rw-r--r-- | sys-apps/systemd-utils/files/251-meson-0.64.patch | 26 | ||||
| -rw-r--r-- | sys-apps/systemd-utils/systemd-utils-251.7.ebuild | 1 |
2 files changed, 27 insertions, 0 deletions
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 |