SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mkosi: Allow using $MESON_VERBOSE to enable verbose meson output

Browse Source
This commit is contained in:
Daan De Meyer
2024-06-03 14:06:19 +02:00
parent 9ee96e7382
commit c45ce65f2f
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot
+1 -1
View File
@@ -87,7 +87,7 @@ env --chdir="pkg/$ID" \
$( ((WITH_TESTS)) || echo --nocheck) \
--force \
_systemd_UPSTREAM=1 \
_systemd_QUIET=1 \
_systemd_QUIET=$( ((MESON_VERBOSE)); echo $? ) \
BUILDDIR="$PWD/pkg/$ID" \
PKGDEST="$OUTPUTDIR" \
PKGEXT=".pkg.tar" \
mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot
+1 -1
View File
@@ -96,7 +96,7 @@ CXX_LD="$( ((LLVM)) && echo lld)" \
--define "build_cflags $(rpm "${COMMON_MACRO_OVERRIDES[@]}" --eval "%{?build_cflags}") $MKOSI_CFLAGS $CFLAGS" \
--define "build_cxxflags $(rpm "${COMMON_MACRO_OVERRIDES[@]}" --eval "%{?build_cxxflags}") $MKOSI_CFLAGS $CFLAGS" \
--define "build_ldflags $(rpm "${COMMON_MACRO_OVERRIDES[@]}" --eval "%{?build_ldflags}") $MKOSI_LDFLAGS $LDFLAGS" \
--define "meson_build %{shrink:%{__meson} compile -C %{_vpath_builddir} -j %{_smp_build_ncpus} %{nil}}" \
--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}}" \
--define "meson_extra_configure_options $MKOSI_MESON_OPTIONS $MESON_OPTIONS" \
$( ((WITH_DEBUG)) || echo "--define=__brp_strip %{nil}") \
mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot
+1 -1
View File
@@ -71,7 +71,7 @@ build() {
$( ((WITH_TESTS)) || echo nocheck) \
$( ((WITH_DOCS)) || echo nodoc) \
$( ((WITH_DEBUG)) && echo debug || echo nostrip) \
terse \
$( ! ((MESON_VERBOSE)) && echo terse) \
optimize=-lto \
hardening=-fortify \
")" \
mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot
+1 -1
View File
@@ -101,7 +101,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} %{nil}}" \
--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}}" \
--define "__meson_auto_features auto $MKOSI_MESON_OPTIONS $MESON_OPTIONS" \
--define "__os_install_post /usr/lib/rpm/brp-suse %{nil}" \