From 8b5888e6c5cbc774ba024d416a345b8bcd809f47 Mon Sep 17 00:00:00 2001 From: josibake Date: Wed, 3 Jul 2024 21:46:57 +0200 Subject: [PATCH] build: enable multiprocess in guix builds --- contrib/guix/guix-build | 2 +- contrib/guix/libexec/build.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build index 2ea574fe4b98c..e42f05784f86b 100755 --- a/contrib/guix/guix-build +++ b/contrib/guix/guix-build @@ -296,7 +296,7 @@ mkdir -p "$OUTDIR_BASE" # Download the depends sources now as we won't have internet access in the build # container for host in $HOSTS; do - make -C "${PWD}/depends" -j"$JOBS" download-"$(host_to_commonname "$host")" ${V:+V=1} ${SOURCES_PATH:+SOURCES_PATH="$SOURCES_PATH"} + make -C "${PWD}/depends" NO_QT=1 MULTIPROCESS=1 -j"$JOBS" download-"$(host_to_commonname "$host")" ${V:+V=1} ${SOURCES_PATH:+SOURCES_PATH="$SOURCES_PATH"} done # Usage: outdir_for_host HOST SUFFIX diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index 9bc8c0e75d7cc..40bd5084e223d 100755 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -168,7 +168,7 @@ export TZ="UTC" #################### # Build the depends tree, overriding variables that assume multilib gcc -make -C depends --jobs="$JOBS" HOST="$HOST" \ +make -C depends NO_QT=1 MULTIPROCESS=1 --jobs="$JOBS" HOST="$HOST" \ ${V:+V=1} \ ${SOURCES_PATH+SOURCES_PATH="$SOURCES_PATH"} \ ${BASE_CACHE+BASE_CACHE="$BASE_CACHE"} \ @@ -200,7 +200,7 @@ mkdir -p "$OUTDIR" ########################### # CONFIGFLAGS -CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests --disable-fuzz-binary" +CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests --disable-fuzz-binary --enable-multiprocess" # CFLAGS HOST_CFLAGS="-O2 -g"