Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
systemd (250.4.2-deepin3) unstable; urgency=medium

* Fix build error by meson.
upstream: https://github.com/systemd/systemd/issues/25677

-- Tianyu Chen <sweetyfish@deepin.org> Fri, 14 Jul 2023 10:55:08 +0800

systemd (250.4.2-deepin2) unstable; urgency=medium

* xdg-autostart=false.
Expand Down
1 change: 1 addition & 0 deletions debian/patches/series
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ deepin-set-timesync-and-journalflush-service-type.patch
deepin_add_force_hibernate_option.patch
change-external-monitor-detecting-logic.patch
mount-fix-command-race-with-mountinfo.patch
systemd-pull-24943.patch
26 changes: 26 additions & 0 deletions debian/patches/systemd-pull-24943.patch
Original file line number Diff line number Diff line change
@@ -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 (