From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 4 Jun 2024 09:04:05 +0000 (+0200)
Subject: mkosi: Use __meson_verbose in opensuse build script
X-Git-Tag: v256-rc4~23^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F33192%2Fhead;p=thirdparty%2Fsystemd.git

mkosi: Use __meson_verbose in opensuse build script

OpenSUSE Tumbleweed now ships meson 1.4.0 which ships the new
__meson_verbose macro.
---

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 28c43fd4f59..0a08e8191a9 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
@@ -69,8 +69,6 @@ fi
 
 build() {
     IFS=
-    # TODO: Replace meson_build and meson_install overrides with "--undefine __meson_verbose" once
-    # https://github.com/mesonbuild/meson/pull/12835 is available.
     # shellcheck disable=SC2046
     env \
     --unset CFLAGS \
@@ -99,8 +97,7 @@ build() {
         --define "build_cflags $(rpm --eval "%{?build_cflags}") $MKOSI_CFLAGS $CFLAGS" \
         --define "build_cxxflags $(rpm --eval "%{?build_cxxflags}") $MKOSI_CFLAGS $CFLAGS" \
         --define "build_ldflags $MKOSI_LDFLAGS $LDFLAGS" \
-        --define "meson_build %{shrink:%{__meson} compile -C %{_vpath_builddir} -j %{_smp_build_ncpus} $( ((MESON_VERBOSE)) && echo --verbose) %{nil}}" \
-        --define "meson_install %{shrink:DESTDIR=%{buildroot} %{__meson} install -C %{_vpath_builddir} --no-rebuild --quiet %{nil}}" \
+        $( ((MESON_VERBOSE)) || echo "--undefine=__meson_verbose") \
         --define "meson_extra_configure_options $MKOSI_MESON_OPTIONS $MESON_OPTIONS" \
         --define "__os_install_post /usr/lib/rpm/brp-suse %{nil}" \
         --define "__elf_exclude_path ^/usr/lib/systemd/tests/unit-tests/.*$" \