From 7f1d7fed801181d7551965477c298ea083a260a4 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Wed, 17 Apr 2024 15:38:24 +0200 Subject: [PATCH] mkosi: Override build_cflags instead of _distro_extra_cflags The latter is not supported on CentOS Stream 9. --- .../system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bb6854c38f..a1f77bcc9b 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}" \