From a13c84229128fe07775ded872c7a095111b715ac Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 5 Nov 2022 02:27:50 -0400 Subject: [PATCH] xbps-src: default XBPS_MAKEJOBS to `nproc` previously this defaulted to 1. In some rare cases, nproc is not desirable, but that can be easily overriden in the standard ways, etc/conf or -jN. For compatibility with other distros, it defaults to 1 when nproc is not available. --- common/xbps-src/shutils/common.sh | 1 - xbps-src | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh index ea67dabfd96..1aeeaddc268 100644 --- a/common/xbps-src/shutils/common.sh +++ b/common/xbps-src/shutils/common.sh @@ -482,7 +482,6 @@ setup_pkg() { DESTDIR=$XBPS_DESTDIR/$XBPS_CROSS_TRIPLET/${sourcepkg}-${version} PKGDESTDIR=$XBPS_DESTDIR/$XBPS_CROSS_TRIPLET/${pkg}-${version} - : ${XBPS_MAKEJOBS:=1} export XBPS_ORIG_MAKEJOBS=${XBPS_ORIG_MAKEJOBS:=$XBPS_MAKEJOBS} if [ -n "$disable_parallel_build" ]; then XBPS_MAKEJOBS=1 diff --git a/xbps-src b/xbps-src index 0ee7af50740..cdb5f8c6d64 100755 --- a/xbps-src +++ b/xbps-src @@ -494,6 +494,13 @@ fi [ -n "$XBPS_ARG_CHECK_PKGS" ] && XBPS_CHECK_PKGS="$XBPS_ARG_CHECK_PKGS" [ -n "$XBPS_ARG_MAKEJOBS" ] && XBPS_MAKEJOBS="$XBPS_ARG_MAKEJOBS" +# Default to nproc for XBPS_MAKEJOBS if not set and nproc is available +if command -v nproc >/dev/null ; then + : ${XBPS_MAKEJOBS:=$(nproc)} +else + : ${XBPS_MAKEJOBS:=1} +fi + export XBPS_BUILD_ONLY_ONE_PKG XBPS_SKIP_REMOTEREPOS XBPS_BUILD_FORCEMODE \ XBPS_INFORMATIVE_RUN XBPS_TEMP_MASTERDIR XBPS_BINPKG_EXISTS \ XBPS_USE_GIT_REVS XBPS_CHECK_PKGS XBPS_DEBUG_PKGS XBPS_SKIP_DEPS \