From: Guus Sliepen Date: Sun, 5 Apr 2026 11:07:46 +0000 (+0200) Subject: Fix muon build in Alpine X-Git-Url: https://www.tinc-vpn.org/git/?a=commitdiff_plain;h=af2ce76b98f8ad30a290d35fd0b19133611c9504;p=tinc Fix muon build in Alpine --- diff --git a/.ci/muon/run.sh b/.ci/muon/run.sh index 933ef8c8..1499c33d 100755 --- a/.ci/muon/run.sh +++ b/.ci/muon/run.sh @@ -13,5 +13,15 @@ else exit 1 fi +if samu --version >/dev/null; then + SAMU=samu +elif ninja --version >/dev/null; then + SAMU=ninja +else + echo 'Neither samu nor ninja found' >&2 + exit 1 +fi + $MUON setup "$dir" -$MUON -C "$dir" test basic.py +$SAMU -C "$dir" +"$dir"/src/tinc --version diff --git a/src/include/meson.build b/src/include/meson.build index c192f186..1cbd8ca6 100644 --- a/src/include/meson.build +++ b/src/include/meson.build @@ -1,7 +1,7 @@ configure_file(output: 'config.h', configuration: cdata) src_lib_common += vcs_tag( - command: [python_path, src_root / 'version.py'], + command: [src_root / 'version.py'], input: '../version_git.h.in', output: 'version_git.h', )