RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2025-03-02 09:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Parallel build fixes and minor cleanups

Browse Source 
Fixes parallel builds which were broken in
584edbe3c5 by insufficient RTFM.

Enables parallel schroot builds.
This commit is contained in:
bones_was_here 2023-12-26 04:56:51 +10:00
parent 42baa315f4
commit cd91b50fc4
No known key found for this signature in database
GPG Key ID: 982FE90EDA930528
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -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)

6
misc/tools/all/release.subr
View File

@ -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