system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-01 13:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

mkosi: Use __meson_verbose in opensuse build script

Browse source 
OpenSUSE Tumbleweed now ships meson 1.4.0 which ships the new
__meson_verbose macro.
This commit is contained in:
Daan De Meyer 2024-06-04 11:04:05 +02:00
parent a16c186667
commit 98a0e73b45
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot
View file

@ -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/.*$" \