diff options
| author | Alex Richardson <arichardson@FreeBSD.org> | 2022-08-09 08:31:03 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2022-08-10 11:18:20 +0000 |
| commit | 2659a0f18e832f4a18f868262163f277b1443db6 (patch) | |
| tree | db1bca0850b02ec35de78ca18058a9f33d713ccd /tools | |
| parent | defbade7b98a1fe8b6b01c6783fc2078e46b2e9f (diff) | |
| download | dbus-2659a0f18e832f4a18f868262163f277b1443db6.tar.gz | |
gitlab-ci: Use GNU make on FreeBSD
The Makefile.am files contain % pattern rules that are not supported by
`make` (bmake) on FreeBSD. Since the replacing the patterns is non-trivial,
this commit updates the CI script to use GNU make when building on FreeBSD.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/ci-build.sh | 5 | ||||
| -rwxr-xr-x | tools/ci-install.sh | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tools/ci-build.sh b/tools/ci-build.sh index f9d9187c..c5915fac 100755 --- a/tools/ci-build.sh +++ b/tools/ci-build.sh @@ -260,7 +260,10 @@ case "$ci_host" in ;; esac -make="make -j${ci_parallel} V=1 VERBOSE=1" +# Allow overriding make (e.g. on FreeBSD it has to be set to gmake) +: "${make:=make}" +export MAKE=${make} +make="${make} -j${ci_parallel} V=1 VERBOSE=1" case "$ci_buildsys" in (autotools) diff --git a/tools/ci-install.sh b/tools/ci-install.sh index 328bb5c7..5b0f9c2a 100755 --- a/tools/ci-install.sh +++ b/tools/ci-install.sh @@ -320,6 +320,7 @@ case "$ci_distro" in expat glib git + gmake libtool libX11 libxslt |