From: bones_was_here <bones_was_here@xonotic.au>
Date: Mon, 25 Dec 2023 18:56:51 +0000 (+1000)
Subject: Parallel build fixes and minor cleanups
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cd91b50fc45129b170a52c6ebb5539fe3662c53c;p=xonotic%2Fxonotic.git

Parallel build fixes and minor cleanups

Fixes parallel builds which were broken in
584edbe3c5a1f0ab189d84d4d7b4a921f8064160 by insufficient RTFM.

Enables parallel schroot builds.
---

diff --git a/Makefile b/Makefile
index 4a2c90e7..d7d329d2 100644
--- a/Makefile
+++ b/Makefile
@@ -55,8 +55,6 @@ endif
 
 # If requested, these targets must always run first:
 .EXTRA_PREREQS := $(filter clean update-stable update-beta, $(MAKECMDGOALS))
-# It makes sense to `clean-sources` after building if requested.
-.NOTPARALLEL: $(.EXTRA_PREREQS) clean-sources
 
 .PHONY: clean-sources
 clean-sources:
@@ -82,12 +80,12 @@ $(D0SRC)/.libs/libd0_blind_id.a $(D0SRC)/.libs/libd0_rijndael.a:
 	$(MAKE) -C $(D0SRC) clean  # ensures missing .a files are created FIXME WORKAROUND
 	$(MAKE) -C $(D0SRC)
 
-$(DPSRC)/darkplaces-dedicated: $(D0SRC)/.libs/libd0_blind_id.a $(D0SRC)/.libs/libd0_rijndael.a
+$(DPSRC)/darkplaces-dedicated: $(D0SRC)/.libs/libd0_blind_id.a
 	$(MAKE) -C $(DPSRC) sv-release
 $(SERVER): $(DPSRC)/darkplaces-dedicated
 	cp $(DPSRC)/darkplaces-dedicated $(SERVER)
 
-$(DPSRC)/darkplaces-sdl: $(D0SRC)/.libs/libd0_blind_id.a $(D0SRC)/.libs/libd0_rijndael.a
+$(DPSRC)/darkplaces-sdl: $(D0SRC)/.libs/libd0_blind_id.a
 	$(MAKE) -C $(DPSRC) sdl-release
 $(CLIENT): $(DPSRC)/darkplaces-sdl
 	cp $(DPSRC)/darkplaces-sdl $(CLIENT)
diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index cba2bd22..68172675 100644
--- a/misc/tools/all/release.subr
+++ b/misc/tools/all/release.subr
@@ -228,7 +228,7 @@ case "$cmd" in
 		esac
 		case " $HOSTS_THAT_ARE_SCHROOT " in
 			*\ $host\ *)
-				schroot="schroot -c $host --"
+				schroot="schroot -c $host --preserve-environment --"
 				;;
 		esac
 		case " $HOSTS_THAT_ARE_MYSELF $HOSTS_THAT_ARE_SCHROOT " in
@@ -307,11 +307,13 @@ case "$cmd" in
 		targetdir=$3
 		verbose mkdir -p "$targetdir"
 		(
-			cd "misc/buildsrc"
+			cd "$d0/misc/buildsrc"
 			verbose ./dlls.sh clean "$buildpath"
 			verbose ./dlls.sh all "$buildpath" "$arch"
 		)
 		verbose cp -v $buildpath/out/$arch/* "$targetdir"
+
+		# SDL2
 		verbose mkdir -p "$d0/misc/builddeps/$arch/"
 		verbose rsync --delete -avP "$buildpath/pkg/$arch/sdl" "$d0/misc/builddeps/$arch/"
 		# PKG_CONFIG HACK: avoids needing to modify sdl2-config