From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Mon, 12 Jun 2023 17:55:05 +0000 (+0200)
Subject: CI: Fix problem with configuration when cross building with cmake
X-Git-Tag: dbus-1.15.8~37^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e45eb06b12f06931881b0546d5552fb517ccd29;p=thirdparty%2Fdbus.git

CI: Fix problem with configuration when cross building with cmake

Due to an adaptation of an rpm macro for cross-compiling with cmake, there
was a problem with the previous method of using the current directory as
the build directory. Instead, the command line options provided by cmake
are now used to define the source and build directories, which provide more
stable behavior.

Fix #455
---

diff --git a/tools/ci-build.sh b/tools/ci-build.sh
index 4115a5939..df7ada2c1 100755
--- a/tools/ci-build.sh
+++ b/tools/ci-build.sh
@@ -437,7 +437,7 @@ case "$ci_buildsys" in
                 ;;
         esac
 
-        $cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON "$@" ..
+        $cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON -S "$srcdir" -B "$builddir" "$@"
 
         ${make}
         # The test coverage for OOM-safety is too verbose to be useful on