From: Simon McVittie <smcv@collabora.com>
Date: Fri, 24 Jun 2022 15:48:46 +0000 (+0100)
Subject: CI: Only use openSUSE mingw*-meson as a replacement for `meson setup`
X-Git-Tag: dbus-1.15.0~32^2~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da94d0c0290fab5635713a8f587ad091e9b8ab2f;p=thirdparty%2Fdbus.git

CI: Only use openSUSE mingw*-meson as a replacement for `meson setup`

These pass a lot of configure arguments taken from RPM macros, which
are only accepted by the meson command if we don't explicitly select
a mode.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---

diff --git a/tools/ci-build.sh b/tools/ci-build.sh
index 694fc1284..8a0ddcc03 100755
--- a/tools/ci-build.sh
+++ b/tools/ci-build.sh
@@ -438,20 +438,28 @@ case "$ci_buildsys" in
         # travis-ci, and too slow when running under wine.
         export DBUS_TEST_MALLOC_FAILURES=0
 
-        meson=meson
+        meson_setup=
+
+        # openSUSE has convenience wrappers that run Meson with appropriate
+        # cross options
         case "$ci_host" in
             (i686-w64-mingw32)
-                meson=mingw32-meson
+                meson_setup=mingw32-meson
                 ;;
             (x86_64-w64-mingw32)
-                meson=mingw64-meson
+                meson_setup=mingw64-meson
                 ;;
         esac
+
+        if [ -z "$meson_setup" ]; then
+            meson_setup="meson setup"
+        fi
+
         # FIXME: ducktype target fails on debian CI..
-        $meson setup -Dducktype_docs=disabled
-        $meson compile
-        [ "$ci_test" = no ] || $meson test
-        DESTDIR=DESTDIR $meson install
+        $meson_setup -Dducktype_docs=disabled
+        meson compile
+        [ "$ci_test" = no ] || meson test
+        DESTDIR=DESTDIR meson install
         ( cd DESTDIR && find . -ls)
         ;;
 esac