tree-wide: rename TERMUX_MAKE_PROCESSES to TERMUX_PKG_MAKE_PROCESSES (#…

…1127) Some packages have issues with parallel builds and need to set TERMUX_MAKE_PROCESSES=1. All other build variables that package recipes set are prefixed with TERMUX_PKG, use that for MAKE_PROCESSES as well for consistency. The changes are copied from termux/termux-packages@9e90d1b and it fixes the following error. build.sh: line 40: TERMUX_MAKE_PROCESSES: unbound variable [skip ci]
termux-user-repository · Jul 24, 2024 · ac34cc6 · ac34cc6
1 parent d5b012b
commit ac34cc6
Show file tree

Hide file tree

Showing 41 changed files with 55 additions and 55 deletions.
diff --git a/tur-continuous/carbonyl/build.sh b/tur-continuous/carbonyl/build.sh
@@ -229,7 +229,7 @@ use_thin_lto=false
 termux_step_make() {
 	cd $TERMUX_PKG_SRCDIR
 	(termux_setup_rust
-	cargo build --jobs $TERMUX_MAKE_PROCESSES --target $CARGO_TARGET_NAME --release)
+	cargo build --jobs $TERMUX_PKG_MAKE_PROCESSES --target $CARGO_TARGET_NAME --release)
 
 	cd $TERMUX_PKG_BUILDDIR
 	ninja -C $TERMUX_PKG_BUILDDIR/out/Release headless:headless_shell

diff --git a/tur-hacking/hashcat/build.sh b/tur-hacking/hashcat/build.sh
@@ -22,7 +22,7 @@ termux_step_make() {
 	rm -rf $TERMUX_PREFIX/opt/hashcat/
 	mkdir -p $TERMUX_PREFIX/opt/hashcat/
 
-	make -j $TERMUX_MAKE_PROCESSES
+	make -j $TERMUX_PKG_MAKE_PROCESSES
 }
 
 termux_step_make_install() {

diff --git a/tur-multilib/hangover-wine/build.sh b/tur-multilib/hangover-wine/build.sh
@@ -95,7 +95,7 @@ termux_step_host_build() {
 	# Make host wine-tools
 	(unset sudo; sudo apt update; sudo apt install libfreetype-dev:i386 -yqq)
 	"$TERMUX_PKG_SRCDIR/configure" ${TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS}
-	make -j "$TERMUX_MAKE_PROCESSES" __tooldeps__ nls/all
+	make -j "$TERMUX_PKG_MAKE_PROCESSES" __tooldeps__ nls/all
 }
 
 termux_step_pre_configure() {
@@ -117,9 +117,9 @@ termux_step_pre_configure() {
 }
 
 termux_step_make() {
-	make -j $TERMUX_MAKE_PROCESSES
+	make -j $TERMUX_PKG_MAKE_PROCESSES
 }
 
 termux_step_make_install() {
-	make -j $TERMUX_MAKE_PROCESSES install
+	make -j $TERMUX_PKG_MAKE_PROCESSES install
 }
diff --git a/tur-multilib/wine-devel/build.sh b/tur-multilib/wine-devel/build.sh
@@ -109,7 +109,7 @@ termux_step_host_build() {
 	# Make host wine-tools
 	(unset sudo; sudo apt update; sudo apt install libfreetype-dev:i386 -yqq)
 	"$TERMUX_PKG_SRCDIR/configure" ${TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS}
-	make -j "$TERMUX_MAKE_PROCESSES" __tooldeps__ nls/all
+	make -j "$TERMUX_PKG_MAKE_PROCESSES" __tooldeps__ nls/all
 }
 
 termux_step_pre_configure() {
@@ -131,9 +131,9 @@ termux_step_pre_configure() {
 }
 
 termux_step_make() {
-	make -j $TERMUX_MAKE_PROCESSES
+	make -j $TERMUX_PKG_MAKE_PROCESSES
 }
 
 termux_step_make_install() {
-	make -j $TERMUX_MAKE_PROCESSES install
+	make -j $TERMUX_PKG_MAKE_PROCESSES install
 }
diff --git a/tur-multilib/wine-stable/build.sh b/tur-multilib/wine-stable/build.sh
@@ -107,7 +107,7 @@ termux_step_host_build() {
 	# Make host wine-tools
 	(unset sudo; sudo apt update; sudo apt install libfreetype-dev:i386 -yqq)
 	"$TERMUX_PKG_SRCDIR/configure" ${TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS}
-	make -j "$TERMUX_MAKE_PROCESSES" __tooldeps__ nls/all
+	make -j "$TERMUX_PKG_MAKE_PROCESSES" __tooldeps__ nls/all
 }
 
 termux_step_pre_configure() {
@@ -129,9 +129,9 @@ termux_step_pre_configure() {
 }
 
 termux_step_make() {
-	make -j $TERMUX_MAKE_PROCESSES -k
+	make -j $TERMUX_PKG_MAKE_PROCESSES -k
 }
 
 termux_step_make_install() {
-	make -j $TERMUX_MAKE_PROCESSES install
+	make -j $TERMUX_PKG_MAKE_PROCESSES install
 }
diff --git a/tur-multilib/wine-staging/build.sh b/tur-multilib/wine-staging/build.sh
@@ -115,7 +115,7 @@ termux_step_host_build() {
 	# Make host wine-tools
 	(unset sudo; sudo apt update; sudo apt install libfreetype-dev:i386 -yqq)
 	"$TERMUX_PKG_SRCDIR/configure" ${TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS}
-	make -j "$TERMUX_MAKE_PROCESSES" __tooldeps__ nls/all
+	make -j "$TERMUX_PKG_MAKE_PROCESSES" __tooldeps__ nls/all
 }
 
 termux_step_pre_configure() {
@@ -137,9 +137,9 @@ termux_step_pre_configure() {
 }
 
 termux_step_make() {
-	make -j $TERMUX_MAKE_PROCESSES
+	make -j $TERMUX_PKG_MAKE_PROCESSES
 }
 
 termux_step_make_install() {
-	make -j $TERMUX_MAKE_PROCESSES install
+	make -j $TERMUX_PKG_MAKE_PROCESSES install
 }
diff --git a/tur-on-device/classic-flang/build.sh b/tur-on-device/classic-flang/build.sh
@@ -41,7 +41,7 @@ termux_step_pre_configure() {
 	pushd $TERMUX_PKG_SRCDIR/runtime/libpgmath
 	mkdir -p build && cd build
 	cmake -DCMAKE_INSTALL_PREFIX=$TERMUX_PREFIX ..
-	make -j$TERMUX_MAKE_PROCESSES
+	make -j$TERMUX_PKG_MAKE_PROCESSES
 	make install
 	cd .. && rm -rf build
 	popd

diff --git a/tur/codon/build.sh b/tur/codon/build.sh
@@ -31,7 +31,7 @@ termux_step_host_build() {
 
 	termux_setup_cmake
 	cmake "$TERMUX_PKG_SRCDIR"
-	make -j $TERMUX_MAKE_PROCESSES peg2cpp
+	make -j $TERMUX_PKG_MAKE_PROCESSES peg2cpp
 }
 
 termux_step_pre_configure() {

diff --git a/tur/detchar/build.sh b/tur/detchar/build.sh
@@ -11,7 +11,7 @@ TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag"
 
 termux_step_make() {
 	termux_setup_rust
-	cargo build --jobs $TERMUX_MAKE_PROCESSES --target $CARGO_TARGET_NAME --release --locked
+	cargo build --jobs $TERMUX_PKG_MAKE_PROCESSES --target $CARGO_TARGET_NAME --release --locked
 }
 
 termux_step_make_install() {

diff --git a/tur/efte/build.sh b/tur/efte/build.sh
@@ -18,7 +18,7 @@ TERMUX_PKG_HOSTBUILD=true
 termux_step_host_build() {
 	termux_setup_cmake
 	cmake "$TERMUX_PKG_SRCDIR" -DBUILD_X=OFF -DBUILD_CONSOLE=OFF
-	make -j $TERMUX_MAKE_PROCESSES bin2c
+	make -j $TERMUX_PKG_MAKE_PROCESSES bin2c
 }
 
 termux_step_pre_configure() {

diff --git a/tur/ffplayout/build.sh b/tur/ffplayout/build.sh
@@ -67,7 +67,7 @@ termux_step_make() {
 		popd
 	fi
 
-	cargo build --jobs $TERMUX_MAKE_PROCESSES --release --target $CARGO_TARGET_NAME
+	cargo build --jobs $TERMUX_PKG_MAKE_PROCESSES --release --target $CARGO_TARGET_NAME
 }
 
 termux_step_make_install() {

diff --git a/tur/hare/build.sh b/tur/hare/build.sh
@@ -58,7 +58,7 @@ termux_step_host_build() {
 		"
 	fi
 
-	make $TERMUX_PKG_EXTRA_HOSTBUILD_MAKE_ARGS -j $TERMUX_MAKE_PROCESSES
+	make $TERMUX_PKG_EXTRA_HOSTBUILD_MAKE_ARGS -j $TERMUX_PKG_MAKE_PROCESSES
 	make install $TERMUX_PKG_EXTRA_HOSTBUILD_MAKE_ARGS
 	cp "$TERMUX_PKG_BUILDER_DIR/cross_setup.sh" "$_CROSS_PREFIX/setup.sh"
 }

diff --git a/tur/harec/build.sh b/tur/harec/build.sh
@@ -19,7 +19,7 @@ termux_step_host_build() {
 	. "$TERMUX_PREFIX/opt/qbe/cross/setup.sh"
 
 	"$TERMUX_PKG_SRCDIR/configure" --prefix="$_CROSS_PREFIX"
-	make -j $TERMUX_MAKE_PROCESSES
+	make -j $TERMUX_PKG_MAKE_PROCESSES
 	make install
 	cp "$TERMUX_PKG_BUILDER_DIR/cross_setup.sh" "$_CROSS_PREFIX/setup.sh"
 }

diff --git a/tur/hurl/build.sh b/tur/hurl/build.sh
@@ -11,7 +11,7 @@ TERMUX_PKG_BUILD_DEPENDS="openssl, libxml2"
 
 termux_step_make() {
 	termux_setup_rust
-	cargo build --jobs $TERMUX_MAKE_PROCESSES --target $CARGO_TARGET_NAME --release
+	cargo build --jobs $TERMUX_PKG_MAKE_PROCESSES --target $CARGO_TARGET_NAME --release
 }
 
 termux_step_make_install() {

diff --git a/tur/krabby/build.sh b/tur/krabby/build.sh
@@ -10,7 +10,7 @@ TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_make() {
 	termux_setup_rust
-	cargo build --jobs $TERMUX_MAKE_PROCESSES --target $CARGO_TARGET_NAME --release
+	cargo build --jobs $TERMUX_PKG_MAKE_PROCESSES --target $CARGO_TARGET_NAME --release
 }
 
 termux_step_make_install() {

diff --git a/tur/libllvm-11/build.sh b/tur/libllvm-11/build.sh
@@ -44,7 +44,7 @@ termux_step_host_build() {
 	termux_setup_ninja
 
 	cmake -G Ninja $TERMUX_PKG_SRCDIR/llvm
-	ninja -j $TERMUX_MAKE_PROCESSES llvm-tblgen
+	ninja -j $TERMUX_PKG_MAKE_PROCESSES llvm-tblgen
 }
 
 termux_step_pre_configure() {

diff --git a/tur/libllvm-13/build.sh b/tur/libllvm-13/build.sh
@@ -44,7 +44,7 @@ termux_step_host_build() {
 	termux_setup_ninja
 
 	cmake -G Ninja $TERMUX_PKG_SRCDIR/llvm
-	ninja -j $TERMUX_MAKE_PROCESSES llvm-tblgen
+	ninja -j $TERMUX_PKG_MAKE_PROCESSES llvm-tblgen
 }
 
 termux_step_pre_configure() {

diff --git a/tur/libllvm-14/build.sh b/tur/libllvm-14/build.sh
@@ -43,7 +43,7 @@ termux_step_host_build() {
 	termux_setup_ninja
 
 	cmake -G Ninja -DCMAKE_BUILD_TYPE=Release $TERMUX_PKG_SRCDIR/llvm
-	ninja -j $TERMUX_MAKE_PROCESSES llvm-tblgen
+	ninja -j $TERMUX_PKG_MAKE_PROCESSES llvm-tblgen
 }
 
 termux_step_pre_configure() {

diff --git a/tur/libllvm-15/build.sh b/tur/libllvm-15/build.sh
@@ -57,7 +57,7 @@ termux_step_host_build() {
 	cmake -G Ninja "-DCMAKE_BUILD_TYPE=Release" \
 					"-DLLVM_ENABLE_PROJECTS=clang" \
 					$TERMUX_PKG_SRCDIR/llvm
-	ninja -j $TERMUX_MAKE_PROCESSES llvm-tblgen clang-tblgen
+	ninja -j $TERMUX_PKG_MAKE_PROCESSES llvm-tblgen clang-tblgen
 }
 
 termux_step_pre_configure() {

diff --git a/tur/libllvm-16/build.sh b/tur/libllvm-16/build.sh
@@ -63,7 +63,7 @@ termux_step_host_build() {
 	cmake -G Ninja "-DCMAKE_BUILD_TYPE=Release" \
 				"-DLLVM_ENABLE_PROJECTS=clang;mlir" \
 				$TERMUX_PKG_SRCDIR/llvm
-	ninja -j $TERMUX_MAKE_PROCESSES clang-tblgen llvm-tblgen \
+	ninja -j $TERMUX_PKG_MAKE_PROCESSES clang-tblgen llvm-tblgen \
 						mlir-tblgen mlir-linalg-ods-yaml-gen
 }
 

diff --git a/tur/libllvm-classic-flang/build.sh b/tur/libllvm-classic-flang/build.sh
@@ -66,7 +66,7 @@ termux_step_host_build() {
 	cmake -G Ninja "-DCMAKE_BUILD_TYPE=Release" \
 					"-DLLVM_ENABLE_PROJECTS=clang" \
 					$TERMUX_PKG_SRCDIR/llvm
-	ninja -j $TERMUX_MAKE_PROCESSES llvm-tblgen clang-tblgen
+	ninja -j $TERMUX_PKG_MAKE_PROCESSES llvm-tblgen clang-tblgen
 }
 
 termux_step_pre_configure() {

diff --git a/tur/libllvm-codon/build.sh b/tur/libllvm-codon/build.sh
@@ -53,7 +53,7 @@ termux_step_host_build() {
 
 	cmake -G Ninja "-DCMAKE_BUILD_TYPE=Release" \
 					$TERMUX_PKG_SRCDIR/llvm
-	ninja -j $TERMUX_MAKE_PROCESSES llvm-tblgen
+	ninja -j $TERMUX_PKG_MAKE_PROCESSES llvm-tblgen
 }
 
 termux_step_pre_configure() {

diff --git a/tur/meli/build.sh b/tur/meli/build.sh
@@ -19,7 +19,7 @@ termux_step_pre_configure() {
 }
 
 termux_step_make() {
-	cargo build --jobs $TERMUX_MAKE_PROCESSES --target $CARGO_TARGET_NAME --release
+	cargo build --jobs $TERMUX_PKG_MAKE_PROCESSES --target $CARGO_TARGET_NAME --release
 }
 
 termux_step_make_install() {

diff --git a/tur/nodejs-18/build.sh b/tur/nodejs-18/build.sh
@@ -71,9 +71,9 @@ termux_step_configure() {
 
 termux_step_make() {
 	if [ "${TERMUX_DEBUG_BUILD}" = "true" ]; then
-		ninja -C out/Debug -j "${TERMUX_MAKE_PROCESSES}" || bash
+		ninja -C out/Debug -j "${TERMUX_PKG_MAKE_PROCESSES}" || bash
 	else
-		ninja -C out/Release -j "${TERMUX_MAKE_PROCESSES}" || bash
+		ninja -C out/Release -j "${TERMUX_PKG_MAKE_PROCESSES}" || bash
 	fi
 }
 

diff --git a/tur/nodejs-20/build.sh b/tur/nodejs-20/build.sh
@@ -70,9 +70,9 @@ termux_step_configure() {
 
 termux_step_make() {
 	if [ "${TERMUX_DEBUG_BUILD}" = "true" ]; then
-		ninja -C out/Debug -j "${TERMUX_MAKE_PROCESSES}"
+		ninja -C out/Debug -j "${TERMUX_PKG_MAKE_PROCESSES}"
 	else
-		ninja -C out/Release -j "${TERMUX_MAKE_PROCESSES}"
+		ninja -C out/Release -j "${TERMUX_PKG_MAKE_PROCESSES}"
 	fi
 }
 

diff --git a/tur/php7.2/build.sh b/tur/php7.2/build.sh
@@ -52,7 +52,7 @@ ac_cv_func_res_nsearch=no
 termux_step_host_build() {
 	(cd "$TERMUX_PKG_SRCDIR" && ./buildconf --force)
 	"$TERMUX_PKG_SRCDIR/configure" ${TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS}
-	make -j "$TERMUX_MAKE_PROCESSES"
+	make -j "$TERMUX_PKG_MAKE_PROCESSES"
 }
 
 termux_step_pre_configure() {

diff --git a/tur/php7/build.sh b/tur/php7/build.sh
@@ -55,7 +55,7 @@ ac_cv_func_res_nsearch=no
 termux_step_host_build() {
 	(cd "$TERMUX_PKG_SRCDIR" && ./buildconf --force)
 	"$TERMUX_PKG_SRCDIR/configure" ${TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS}
-	make -j "$TERMUX_MAKE_PROCESSES"
+	make -j "$TERMUX_PKG_MAKE_PROCESSES"
 }
 
 termux_step_pre_configure() {

diff --git a/tur/playit/build.sh b/tur/playit/build.sh
@@ -12,7 +12,7 @@ termux_step_pre_configure() {
 }
 
 termux_step_make() {
-	cargo build --jobs $TERMUX_MAKE_PROCESSES --target $CARGO_TARGET_NAME --release
+	cargo build --jobs $TERMUX_PKG_MAKE_PROCESSES --target $CARGO_TARGET_NAME --release
 }
 
 termux_step_make_install() {

diff --git a/tur/python3.10/build.sh b/tur/python3.10/build.sh
@@ -48,7 +48,7 @@ TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS="
 
 termux_step_host_build() {
 	$TERMUX_PKG_SRCDIR/configure $TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS
-	make -j $TERMUX_MAKE_PROCESSES
+	make -j $TERMUX_PKG_MAKE_PROCESSES
 	make altinstall
 }
 

diff --git a/tur/python3.7/build.sh b/tur/python3.7/build.sh
@@ -48,7 +48,7 @@ TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS="
 
 termux_step_host_build() {
 	LN="ln -s" $TERMUX_PKG_SRCDIR/configure $TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS
-	make -j $TERMUX_MAKE_PROCESSES
+	make -j $TERMUX_PKG_MAKE_PROCESSES
 	make altinstall
 }
 

diff --git a/tur/python3.8/build.sh b/tur/python3.8/build.sh
@@ -48,7 +48,7 @@ TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS="
 
 termux_step_host_build() {
 	$TERMUX_PKG_SRCDIR/configure $TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS
-	make -j $TERMUX_MAKE_PROCESSES
+	make -j $TERMUX_PKG_MAKE_PROCESSES
 	make altinstall
 }
 

diff --git a/tur/python3.9/build.sh b/tur/python3.9/build.sh
@@ -48,7 +48,7 @@ TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS="
 
 termux_step_host_build() {
 	$TERMUX_PKG_SRCDIR/configure $TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS
-	make -j $TERMUX_MAKE_PROCESSES
+	make -j $TERMUX_PKG_MAKE_PROCESSES
 	make altinstall
 }
 

diff --git a/tur/qbe/build.sh b/tur/qbe/build.sh
@@ -20,7 +20,7 @@ OUTDIR=$TERMUX_PKG_HOSTBUILD_DIR
 termux_step_host_build() {
 	cd $TERMUX_PKG_SRCDIR
 
-	make $TERMUX_PKG_EXTRA_HOSTBUILD_MAKE_ARGS -j $TERMUX_MAKE_PROCESSES
+	make $TERMUX_PKG_EXTRA_HOSTBUILD_MAKE_ARGS -j $TERMUX_PKG_MAKE_PROCESSES
 	make install $TERMUX_PKG_EXTRA_HOSTBUILD_MAKE_ARGS
 	cp "$TERMUX_PKG_BUILDER_DIR/cross_setup.sh" "$_CROSS_PREFIX/setup.sh"
 }

diff --git a/tur/ruby-2/build.sh b/tur/ruby-2/build.sh
@@ -42,14 +42,14 @@ termux_step_host_build() {
 	./config --prefix=$TERMUX_PKG_HOSTBUILD_DIR/ruby-host-openssl \
 			--openssldir=$TERMUX_PKG_HOSTBUILD_DIR/ruby-host-openssl \
 			shared zlib
-	make -j $TERMUX_MAKE_PROCESSES
+	make -j $TERMUX_PKG_MAKE_PROCESSES
 	make install
 	popd
 
 	"$TERMUX_PKG_SRCDIR/configure" \
 			--prefix=$TERMUX_PKG_HOSTBUILD_DIR/ruby-host \
 			--with-openssl-dir=$TERMUX_PKG_HOSTBUILD_DIR/ruby-host-openssl
-	make -j $TERMUX_MAKE_PROCESSES
+	make -j $TERMUX_PKG_MAKE_PROCESSES
 	make install
 }
 

diff --git a/tur/smartdns/build.sh b/tur/smartdns/build.sh
@@ -27,15 +27,15 @@ termux_step_configure() {
 }
 
 termux_step_make() {
-	make -j $TERMUX_MAKE_PROCESSES \
+	make -j $TERMUX_PKG_MAKE_PROCESSES \
 			PREFIX="$PREFIX" \
 			SBINDIR="$PREFIX/bin" \
 			SYSCONFDIR="$PREFIX/etc" \
 			RUNSTATEDIR="$PREFIX/var/run"
 }
 
 termux_step_make_install() {
-	make install -j $TERMUX_MAKE_PROCESSES \
+	make install -j $TERMUX_PKG_MAKE_PROCESSES \
 			PREFIX="$PREFIX" \
 			SBINDIR="$PREFIX/bin" \
 			SYSCONFDIR="$PREFIX/etc" \

diff --git a/tur/suitesparse/build.sh b/tur/suitesparse/build.sh
@@ -70,8 +70,8 @@ termux_step_make() {
 	CMAKE_OPTIONS+=" -DBUILD_TESTING=OFF"
 	CMAKE_OPTIONS+=" $(echo $TERMUX_PKG_EXTRA_CONFIGURE_ARGS)"
 
-	make -j $TERMUX_MAKE_PROCESSES \
-		CMAKE_OPTIONS="$CMAKE_OPTIONS" JOBS=$TERMUX_MAKE_PROCESSES
+	make -j $TERMUX_PKG_MAKE_PROCESSES \
+		CMAKE_OPTIONS="$CMAKE_OPTIONS" JOBS=$TERMUX_PKG_MAKE_PROCESSES
 }
 
 termux_step_make_install() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -67,7 +67,7 @@ termux_step_make() { @@
     		popd
     	fi
-    	cargo build --jobs $TERMUX_MAKE_PROCESSES --release --target $CARGO_TARGET_NAME
+    	cargo build --jobs $TERMUX_PKG_MAKE_PROCESSES --release --target $CARGO_TARGET_NAME
     }
     termux_step_make_install() {
@@ Expand Down @@