From: Michal Nowak <mnowak@isc.org>
Date: Wed, 14 May 2025 09:34:06 +0000 (+0200)
Subject: Add GNU Make --shuffle option
X-Git-Tag: v9.18.38~13^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=e6ee1ea75fe3d960bdf85e7b80f7bb79cb1b8525;p=thirdparty%2Fbind9.git

Add GNU Make --shuffle option

GNU Make 4.4 introduced the --shuffle option to randomize the order of
goal targets and prerequisites. This helps detect hidden dependencies
and improve build robustness by exposing order-related issues during
parallel builds.

See:

    https://trofi.github.io/posts/238-new-make-shuffle-mode.html
    https://www.gnu.org/software/make/manual/html_node/Options-Summary.html#index-_002d_002dshuffle

(cherry picked from commit 2fd72f10d27e4dbb653539fe92f95d3c58a9b996)
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 78db3d81b9a..ee3c5128cce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -993,6 +993,7 @@ gcc:sid:amd64:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -O3"
     EXTRA_CONFIGURE: "--with-libidn2 --without-lmdb ${WITH_READLINE}"
+    GNUMAKEFLAGS: "--shuffle=reverse"
     RUN_MAKE_INSTALL: 1
   <<: *debian_sid_amd64_image
   <<: *build_job
@@ -1097,6 +1098,7 @@ gcc:tumbleweed:amd64:
     # Doing that requires a DNSRPS provider library to be present on the
     # test host.
     EXTRA_CONFIGURE: "--enable-dnsrps --enable-dnsrps-dl --with-libidn2 ${WITH_READLINE_READLINE}"
+    GNUMAKEFLAGS: "--shuffle=random"
   <<: *tumbleweed_latest_amd64_image
   <<: *build_job