]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
mkosi: Override build_cflags instead of _distro_extra_cflags
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 17 Apr 2024 13:38:24 +0000 (15:38 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 17 Apr 2024 13:38:24 +0000 (15:38 +0200)
The latter is not supported on CentOS Stream 9.

mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot

index bb6854c38fb02c7f9f93bd28a400e6d1eafca9f4..a1f77bcc9bd290bc53c98be2cb83f468c8cf8480 100755 (executable)
@@ -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}" \