From 4cc4c46f2569e155b815c24d1c045d85b029c9f5 Mon Sep 17 00:00:00 2001
From: Lucía Andrea Illanes Albornoz <lucia@luciaillanes.de>
Date: Mar 26 2023 11:27:44 +0000
Subject: patches/bmake{,_host}.local.patch: fix parallel build.

groups/010.host_deps.group:bmake_host:${PKG_MAKEFLAGS_LOADAVG}: set to none.
groups/010.host_deps.group:bmake_host:${PKG_MAKEFLAGS_PARALLELISE}: revert to default.
groups/231.native_packages_etc.group:bmake:${PKG_MAKEFLAGS_LOADAVG}: set to none.
groups/231.native_packages_etc.group:bmake:${PKG_MAKEFLAGS_PARALLELISE}: revert to default.

---

diff --git a/groups/010.host_deps.group b/groups/010.host_deps.group
index d7491bd..f8c9650 100644
--- a/groups/010.host_deps.group
+++ b/groups/010.host_deps.group
@@ -37,10 +37,10 @@ HOST_DEPS_TOOLS_RPM_DISABLE=1;
 : ${PKG_BISON_HOST_URL:=https://ftp.gnu.org/gnu/bison/bison-${PKG_BISON_HOST_VERSION}.tar.xz};
 : ${PKG_BISON_HOST_ENV_VARS_EXTRA:="M4=${PREFIX}/bin/m4"};
 : ${PKG_BMAKE_HOST_URLS_GIT:="bmake=https://github.com/arichardson/bmake@master"};
-: ${PKG_BMAKE_HOST_MAKEFLAGS_PARALLELISE:="-j1"};
 : ${PKG_BMAKE_HOST_CONFIGURE_ARGS:=--with-default-sys-path=${PREFIX}/share/mk};
 : ${PKG_BMAKE_HOST_CFLAGS_BUILD_EXTRA:="-fcommon"};
 : ${PKG_BMAKE_HOST_LDFLAGS_BUILD_EXTRA:="-fcommon"};
+: ${PKG_BMAKE_HOST_MAKEFLAGS_LOADAVG:="none"};
 : ${PKG_BZIP2_HOST_SHA256SUM:=ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269};
 : ${PKG_BZIP2_HOST_VERSION:=1.0.8};
 : ${PKG_BZIP2_HOST_URL:=https://sourceware.org/pub/bzip2/bzip2-${PKG_BZIP2_HOST_VERSION}.tar.gz};
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index f71e324..1203f2f 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -31,7 +31,7 @@ zstd";
 : ${PKG_BMAKE_URLS_GIT:="bmake=https://github.com/arichardson/bmake@master"};
 : ${PKG_BMAKE_CONFIGURE_ARGS="-C --host=${DEFAULT_TARGET} --prefix=/usr --target=${DEFAULT_TARGET}"};
 : ${PKG_BMAKE_ENV_VARS_EXTRA:="BMAKE=${PREFIX}/bin/bmake"};
-: ${PKG_BMAKE_MAKEFLAGS_PARALLELISE:="-j1"};
+: ${PKG_BMAKE_MAKEFLAGS_LOADAVG:="none"};
 : ${PKG_BOCHS_DEPENDS:="curl ncurses sdl1"};
 : ${PKG_BOCHS_SHA256SUM:=a010ab1bfdc72ac5a08d2e2412cd471c0febd66af1d9349bc0d796879de5b17a};
 : ${PKG_BOCHS_VERSION:=2.7};
diff --git a/patches/bmake.local.patch b/patches/bmake.local.patch
index 32bf1d3..20d4552 100644
--- a/patches/bmake.local.patch
+++ b/patches/bmake.local.patch
@@ -24,3 +24,13 @@
  :
  # NAME:
  #	install.sh - portable version of install(1)
+--- bmake/makefile.in.orig	2022-12-26 19:16:39.881930779 +0100
++++ bmake/makefile.in	2023-03-23 18:09:58.883692945 +0100
+@@ -9,6 +9,6 @@
+ all: build
+ 
+ build clean install test:
+-	${srcdir}/boot-strap --prefix=${prefix} -o . op=$@
++	MAKEFLAGS="${MAKEFLAGS%*--jobserver-auth=[0-9],[0=9]*}" ${srcdir}/boot-strap --prefix=${prefix} -o . op=$@
+ 
+ 		
diff --git a/patches/bmake_host.local.patch b/patches/bmake_host.local.patch
index 7973489..0999df4 100644
--- a/patches/bmake_host.local.patch
+++ b/patches/bmake_host.local.patch
@@ -5,3 +5,13 @@
  :
  # NAME:
  #	install.sh - portable version of install(1)
+--- bmake/makefile.in.orig	2022-12-26 19:16:39.881930779 +0100
++++ bmake/makefile.in	2023-03-23 18:09:58.883692945 +0100
+@@ -9,6 +9,6 @@
+ all: build
+ 
+ build clean install test:
+-	${srcdir}/boot-strap --prefix=${prefix} -o . op=$@
++	MAKEFLAGS="${MAKEFLAGS%*--jobserver-auth=[0-9],[0=9]*}" ${srcdir}/boot-strap --prefix=${prefix} -o . op=$@
+ 
+