From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 17 Apr 2024 13:38:24 +0000 (+0200)
Subject: mkosi: Override build_cflags instead of _distro_extra_cflags
X-Git-Tag: v256-rc1~155^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f1d7fed801181d7551965477c298ea083a260a4;p=thirdparty%2Fsystemd.git

mkosi: Override build_cflags instead of _distro_extra_cflags

The latter is not supported on CentOS Stream 9.
---

diff --git a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot
index bb6854c38fb..a1f77bcc9bd 100755
--- a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot
+++ b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot
@@ -57,7 +57,7 @@ rpmbuild \
     $( ((WITH_DEBUG)) || echo "debug_package %{nil}") \
     --define "version_override $VERSION" \
     --define "release_override $RELEASE" \
-    --define "_distro_extra_cflags $EXTRA_CFLAGS" \
+    --define "build_cflags $(rpm --eval %build_cflags) $EXTRA_CFLAGS" \
     --define "meson_build %{shrink:%{__meson} compile -C %{_vpath_builddir} -j %{_smp_build_ncpus} %{nil}}" \
     --define "meson_install %{shrink:DESTDIR=%{buildroot} %{__meson} install -C %{_vpath_builddir} --no-rebuild --quiet %{nil}}" \
     --define "meson_extra_configure_options -D mode=developer -D b_sanitize=${SANITIZERS:-none}" \