scripts: change in PATH variable configurings (#23665)

Author: Maxython

scripts/build/setup/termux_setup_ghc.sh

@@ -27,6 +27,7 @@ termux_setup_ghc() {
 		(
 			set -e
 			unset CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS AR AS CPP LD RANLIB READELF STRIP
+			export PATH="/usr/bin"
 			cd "$TERMUX_GHC_TEMP_FOLDER"
 			./configure --prefix="$TERMUX_GHC_RUNTIME_FOLDER"
 			make install

scripts/build/setup/termux_setup_gn.sh

@@ -25,6 +25,7 @@ termux_setup_gn() {
 			cd $GN_FOLDER
 			(
 				unset CC CXX CFLAGS CXXFLAGS LD LDFLAGS AR AS CPP OBJCOPY OBJDUMP RANLIB READELF STRIP
+				export PATH="/usr/bin"
 				./build/gen.py \
 					--no-last-commit-position
 				cat <<-EOF >./out/last_commit_position.h

scripts/build/setup/termux_setup_meson.sh

@@ -27,7 +27,7 @@ termux_setup_meson() {
 		shopt -u nullglob
 		mv "$MESON_TMP_FOLDER" "$MESON_FOLDER"
 	fi
-	TERMUX_MESON="$MESON_FOLDER/meson.py"
+	TERMUX_MESON="/usr/bin/python${TERMUX_PYTHON_VERSION} ${MESON_FOLDER}/meson.py"
 	TERMUX_MESON_CROSSFILE=$TERMUX_PKG_TMPDIR/meson-crossfile-$TERMUX_ARCH.txt
 	local MESON_CPU MESON_CPU_FAMILY
 	if [ "$TERMUX_ARCH" = "arm" ]; then

scripts/build/setup/termux_setup_python_pip.sh

@@ -53,7 +53,7 @@ termux_setup_python_pip() {
 
 		if [ ! -d "$TERMUX_PYTHON_CROSSENV_PREFIX" ]; then
 			cd "$TERMUX_PYTHON_CROSSENV_SRCDIR"
-			python${TERMUX_PYTHON_VERSION} -m crossenv \
+			/usr/bin/python${TERMUX_PYTHON_VERSION} -m crossenv \
                 		"$TERMUX_PREFIX/bin/python${TERMUX_PYTHON_VERSION}" \
 				"${TERMUX_PYTHON_CROSSENV_PREFIX}"
 		fi
@@ -66,6 +66,6 @@ termux_setup_python_pip() {
 			export SETUPTOOLS_USE_DISTUTILS=stdlib
 		fi
 
-		export PATH="${PATH}:${TERMUX_PYTHON_CROSSENV_PREFIX}/build/bin"
+		export PATH="${TERMUX_PYTHON_CROSSENV_PREFIX}/build/bin:${PATH}"
 	fi
 }

scripts/build/setup/termux_setup_xmake.sh

@@ -46,7 +46,7 @@ termux_setup_xmake() {
 		(
 			# avoid pick up Termux pkg-config, stop link with Termux ncursesw
 			unset AR AS CC CFLAGS CPP CPPFLAGS CXX CXXFLAGS LD LDFLAGS PREFIX TERMUX_ARCH
-			export PATH="/usr/bin:${PATH}"
+			export PATH="/usr/bin"
 			pushd "${XMAKE_FOLDER}"
 			./configure --prefix="${XMAKE_FOLDER}"
 			make -j"$(nproc)" install

scripts/build/termux_step_massage.sh

@@ -26,9 +26,12 @@ termux_step_massage() {
 	# Remove cache file created by gtk-update-icon-cache:
 	rm -f share/icons/hicolor/icon-theme.cache
 
-	# Remove locale files we're not interested in::
+	# Remove locale files we're not interested in:
 	rm -Rf share/locale
 
+	# Remove ldconfig cache:
+	rm -f glibc/etc/ld.so.cache
+
 	# `update-mime-database` updates NOT ONLY "$PREFIX/share/mime/mime.cache".
 	# Simply removing this specific file does not solve the issue.
 	if [ -e "share/mime/mime.cache" ]; then

scripts/build/termux_step_setup_variables.sh

@@ -95,12 +95,8 @@ termux_step_setup_variables() {
 			if [ -n "${LD_PRELOAD-}" ]; then
 				unset LD_PRELOAD
 			fi
-			if ! $(echo "$PATH" | grep -q "^$TERMUX_PREFIX/bin"); then
-				if [ -d "${TERMUX_PREFIX}/bin" ]; then
-					export PATH="${TERMUX_PREFIX}/bin:${PATH}"
-				else
-					termux_error_exit "Glibc components are not installed, run './scripts/setup-termux-glibc.sh'"
-				fi
+			if [ ! -d "${TERMUX_PREFIX}/bin" ]; then
+				termux_error_exit "Glibc components are not installed, run './scripts/setup-termux-glibc.sh'"
 			fi
 		else
 			if [ ! -d "${CGCT_DIR}/${TERMUX_ARCH}/bin" ]; then

scripts/build/toolchain/termux_setup_toolchain_gnu.sh

@@ -57,13 +57,11 @@ termux_setup_toolchain_gnu() {
 	export PKGCONFIG=$PKG_CONFIG
  	export PKG_CONFIG_LIBDIR="$TERMUX_PKG_CONFIG_LIBDIR"
 
-	if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then
-		if ! $(echo "$PATH" | grep -q "^$TERMUX_STANDALONE_TOOLCHAIN/bin:"); then
-			export PATH="$TERMUX_STANDALONE_TOOLCHAIN/bin:$PATH"
-		fi
-  		if ! $(echo "$PATH" | grep -q ":$TERMUX_PREFIX/bin"); then
-			export PATH="$PATH:$TERMUX_PREFIX/bin"
-		fi
+	if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ] && ! tr ':' '\n' <<< "$PATH" | grep -q "^$TERMUX_PREFIX/bin$"; then
+		export PATH="$TERMUX_PREFIX/bin:$PATH"
+	fi
+	if ! tr ':' '\n' <<< "$PATH" | grep -q "^$TERMUX_STANDALONE_TOOLCHAIN/bin$"; then
+		export PATH="$TERMUX_STANDALONE_TOOLCHAIN/bin:$PATH"
 	fi
 
 	export CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"