From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 29 May 2024 08:50:16 +0000 (+0200)
Subject: mkosi: Set EXTRA_CFLAGS on opensuse
X-Git-Tag: v256-rc4~92
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6448993a4b2897658d32c5ec423841e22aa14c68;p=thirdparty%2Fsystemd.git

mkosi: Set EXTRA_CFLAGS on opensuse

The opensuse spec doesn't unconditionally set FORTIFY_SOURCE=2 anymore
so let's drop our workaround.
---

diff --git a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot
index 2fe3d9464c4..8b6fc7ab13c 100755
--- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot
+++ b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot
@@ -40,9 +40,7 @@ DIST="$(rpm --eval %dist)"
 ARCH="$(rpm --eval %_arch)"
 SRCDEST="/usr/src/debug/systemd-$VERSION-${RELEASE}${DIST}.$ARCH"
 
-# TODO: Enable this when the opensuse spec stops unconditionally setting FORTIFY_SOURCE=2.
-# EXTRA_CFLAGS="-O${OPTIMIZATION:-0} -Wp,-U_FORTIFY_SOURCE"
-EXTRA_CFLAGS=""
+EXTRA_CFLAGS="-O${OPTIMIZATION:-0} -Wp,-U_FORTIFY_SOURCE"
 if ((WITH_DEBUG)); then
     EXTRA_CFLAGS="$EXTRA_CFLAGS -fdebug-prefix-map=../src=$SRCDEST"
 fi