From 7d94cdaf66b2e61cd195bc6cca0965692a7d0b53 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20Matu=C5=A1ka?= Date: Mon, 1 Dec 2025 13:31:22 +0100 Subject: [PATCH] Merge pull request #2800 from mmatuska/fix/freebsdci CI: use gmake in Cirrus FreeBSD build (cherry picked from commit 728b43c0c18df60c3e9239fb03c69bd2b1b85ebc) --- .cirrus.yml | 8 ++++---- build/ci/cirrus_ci/ci.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index f719431f5..d5c6d65b5 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -17,14 +17,14 @@ FreeBSD_task: - ./build/ci/cirrus_ci/ci.sh prepare configure_script: - env CFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib ./build/ci/build.sh -a autogen - - env CFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib ./build/ci/build.sh -a configure + - env MAKE=gmake CFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib ./build/ci/build.sh -a configure build_script: - - env MAKE_ARGS="-j 2" ./build/ci/build.sh -a build + - env MAKE=gmake MAKE_ARGS="-j 2" ./build/ci/build.sh -a build test_script: - - env SKIP_TEST_RESTORE_ATIME=1 MAKE_ARGS="-j 2" ./build/ci/build.sh -a test + - env MAKE=gmake SKIP_TEST_RESTORE_ATIME=1 MAKE_ARGS="-j 2" ./build/ci/build.sh -a test - ./build/ci/cirrus_ci/ci.sh test install_script: - - env MAKE_ARGS="-j 2" ./build/ci/build.sh -a install + - env MAKE=gmake MAKE_ARGS="-j 2" ./build/ci/build.sh -a install Windows_Cygwin_task: windows_container: diff --git a/build/ci/cirrus_ci/ci.sh b/build/ci/cirrus_ci/ci.sh index 29425121f..231205723 100755 --- a/build/ci/cirrus_ci/ci.sh +++ b/build/ci/cirrus_ci/ci.sh @@ -23,7 +23,7 @@ then tunefs -N enable /dev/$MD mount /dev/$MD /tmp_acl_nfsv4 chmod 1777 /tmp_acl_nfsv4 - pkg install -y autoconf automake cmake libiconv libtool pkgconf expat libxml2 liblz4 zstd + pkg install -y autoconf automake cmake libiconv libtool pkgconf expat libxml2 liblz4 zstd gmake elif [ "${UNAME}" = "Darwin" ] then set -x -e -- 2.47.3