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.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d4df1b204e2e6e64ff745cc582162c5e9a78b259..96c62c6d8d1720fe68129e7498f4ea968324041b 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -415,7 +415,7 @@ freebsd image:
     # ones starting with ci_ to ci-build.sh manually. This works because
     # $(env | grep "ci_.*=") is evaluated on the current host not in the VM.
     # We also have to forward builddir since this is required by ci-build.sh.
-    - /app/vmctl exec "cd $CI_PROJECT_NAME && env builddir=$builddir $(echo $(env | grep "ci_.*=")) bash -x ./tools/ci-build.sh $CI_BUILD_ARGS"
+    - /app/vmctl exec "cd $CI_PROJECT_NAME && env make=gmake builddir=$builddir $(echo $(env | grep "ci_.*=")) bash -x ./tools/ci-build.sh $CI_BUILD_ARGS"
     # Copy build artifacts from the VM for archiving/JUnit XML display
     - mkdir -p "$builddir"
     - scp -v "vm:$CI_PROJECT_NAME/$builddir/config.h" . || true

diff --git a/tools/ci-build.sh b/tools/ci-build.sh
index f9d9187c10288010d285d87bcbeef5db01492df6..c5915fac484cfe5758523a9db279900d3fe5aa8a 100755 (executable)
--- 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 328bb5c7e5fe10d40218e116b11d62db2fbf12ab..5b0f9c2a8bb62e8620e9f5711462ec18d27255a6 100755 (executable)
--- 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