Skip to contentSkip to conversation

package/Makefile.in: set --shuffle=none for MAKE1

PATCH Applied James Hilliard 3 participants 3 messages Oct 16, 2022 – Oct 13, 2023

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/Makefile.in: set --shuffle=none for MAKE1

Make 4.4 introduces a shuffle mode which randomizes prerequisites in order to better flush out issues with parallel builds, as this mode randomizes prerequisites even when using -j1 builds we must also explicitely mark parallel incompatible builds by setting --shuffle=none which disables goals prerequisites randomization for the parallel incompatible package when running in shuffle mode.

---
Changes v1 -> v2:
- use --shuffle=none to disable shuffle for MAKE1

---
 package/Makefile.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/Makefile.in +3 -1
index 43d214bcbe..c69c201c46 100644
@@ -17,7 +17,9 @@ else
 PARALLEL_JOBS := $(BR2_JLEVEL)
 endif
 
-MAKE1 := $(HOSTMAKE) -j1
+# Only build one job at a time, *and* to not randomise goals and
+# prerequisites ordering in make 4.4+
+MAKE1 := $(HOSTMAKE) -j1 $(if $(findstring --shuffle,$(MAKEFLAGS)),--shuffle=none)
 override MAKE = $(HOSTMAKE) \
 	$(if $(findstring j,$(filter-out --%,$(MAKEFLAGS))),,-j$(PARALLEL_JOBS))
 
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 8 lines · James Hilliard

Make 4.4 introduces a shuffle mode which randomizes prerequisites in order to better flush out issues with parallel builds, as this mode randomizes prerequisites even when using -j1 builds we must also explicitely mark parallel incompatible builds by setting --shuffle=none which disables goals prerequisites randomization for the parallel incompatible package when running in shuffle mode.

Applied to master with a slightly extended commit message, thanks.

Regards,
Arnout

Quoted 12 lines

---
Changes v1 -> v2:
- use --shuffle=none to disable shuffle for MAKE1

---
  package/Makefile.in | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
package/Makefile.in +0 -0
index 43d214bcbe..c69c201c46 100644

package/Makefile.in else · line 25

Quoted 10 lines
package/Makefile.in +3 -1
@@ -17,7 +17,9 @@ else
  PARALLEL_JOBS := $(BR2_JLEVEL)
  endif
 
-MAKE1 := $(HOSTMAKE) -j1
+# Only build one job at a time, *and* to not randomise goals and
+# prerequisites ordering in make 4.4+
+MAKE1 := $(HOSTMAKE) -j1 $(if $(findstring --shuffle,$(MAKEFLAGS)),--shuffle=none)
  override MAKE = $(HOSTMAKE) \
  	$(if $(findstring j,$(filter-out --%,$(MAKEFLAGS))),,-j$(PARALLEL_JOBS))
 

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#2 lore raw
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Arnout" == Arnout Vandecappelle via buildroot <[email protected]> writes:

Quoted 7 lines · James Hilliard

Make 4.4 introduces a shuffle mode which randomizes prerequisites in order to better flush out issues with parallel builds, as this mode randomizes prerequisites even when using -j1 builds we must also explicitely mark parallel incompatible builds by setting --shuffle=none which disables goals prerequisites randomization for the parallel incompatible package when running in shuffle mode.

Quoted 1 line

Applied to master with a slightly extended commit message, thanks.

Committed to 2023.02.x and 2023.08.x, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot