Update repo

disabled-packages/zig/build.sh

@@ -1,22 +0,0 @@
-TERMUX_PKG_HOMEPAGE=https://ziglang.org
-TERMUX_PKG_DESCRIPTION="General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software."
-TERMUX_PKG_LICENSE="MIT"
-TERMUX_PKG_MAINTAINER="@leapofazzam123"
-TERMUX_PKG_VERSION=0.9.1
-TERMUX_PKG_SRCURL=https://ziglang.org/download/$TERMUX_PKG_VERSION/zig-$TERMUX_PKG_VERSION.tar.xz
-TERMUX_PKG_SHA256=38cf4e84481f5facc766ba72783e7462e08d6d29a5d47e3b75c8ee3142485210
-TERMUX_PKG_DEPENDS="libandroid-spawn, libc++, libxml2, ncurses, zlib"
-TERMUX_PKG_BUILD_DEPENDS="llvm, libllvm-static"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--DZIG_PREFER_CLANG_CPP_DYLIB=OFF
--DLLVM_LIBDIRS=$TERMUX_PREFIX/lib
-"
-
-termux_step_pre_configure() {
-	termux_setup_zig
-	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="
-		-DZIG_EXECUTABLE=$(command -v zig)
-		-DZIG_TARGET_TRIPLE=$ZIG_TARGET_NAME
-		"
-	LDFLAGS+=" -landroid-spawn -lncursesw -lxml2 -lz"
-}

disabled-packages/zig/cmake-Findllvm.cmake.patch

@@ -1,11 +0,0 @@
---- a/cmake/Findllvm.cmake
-+++ b/cmake/Findllvm.cmake
-@@ -353,6 +353,8 @@
-   FIND_AND_ADD_LLVM_LIB(LLVMBinaryFormat)
-   FIND_AND_ADD_LLVM_LIB(LLVMSupport)
-   FIND_AND_ADD_LLVM_LIB(LLVMDemangle)
-+  FIND_AND_ADD_LLVM_LIB(Polly)
-+  FIND_AND_ADD_LLVM_LIB(PollyISL)
- endif()
- 
- include(FindPackageHandleStandardArgs)

scripts/build/setup/termux_setup_zig.sh

@@ -1,44 +1,40 @@
+# shellcheck shell=bash disable=SC2155
 termux_setup_zig() {
-	local ZIG_VERSION=0.9.1
-	local ZIG_FOLDER
-
-	if [ "${TERMUX_PACKAGES_OFFLINE-false}" = "true" ]; then
+	local ZIG_VERSION=0.11.0
+	local ZIG_TXZ_URL=https://ziglang.org/download/${ZIG_VERSION}/zig-linux-x86_64-${ZIG_VERSION}.tar.xz
+	local ZIG_TXZ_SHA256=2d00e789fec4f71790a6e7bf83ff91d564943c5ee843c5fd966efc474b423047
+	local ZIG_TXZ_FILE=${TERMUX_PKG_TMPDIR}/zig-${ZIG_VERSION}.tar.xz
+	local ZIG_FOLDER=${TERMUX_COMMON_CACHEDIR}/zig-${ZIG_VERSION}
+	if [[ "${TERMUX_PACKAGES_OFFLINE-false}" == "true" ]]; then
 		ZIG_FOLDER=${TERMUX_SCRIPTDIR}/build-tools/zig-${ZIG_VERSION}
-	else
-		ZIG_FOLDER=${TERMUX_COMMON_CACHEDIR}/zig-${ZIG_VERSION}
 	fi
+	local ZIG_PKG_VERSION=$(. "${TERMUX_SCRIPTDIR}/packages/zig/build.sh"; echo ${TERMUX_PKG_VERSION})
 
-	if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then
-		if [ ! -x "$ZIG_FOLDER/zig" ]; then
-			mkdir -p "$ZIG_FOLDER"
-			local ZIG_TARBALL=$TERMUX_PKG_TMPDIR/zig-$ZIG_VERSION.zip
-			termux_download https://ziglang.org/download/$ZIG_VERSION/zig-linux-x86_64-$ZIG_VERSION.tar.xz \
-				"$ZIG_TARBALL" \
-				be8da632c1d3273f766b69244d80669fe4f5e27798654681d77c992f17c237d7
-			tar xf "$ZIG_TARBALL" -C "$ZIG_FOLDER" --strip-components=1
-		fi
-		export PATH=$ZIG_FOLDER:$PATH
-	else
-		local ZIG_PKG_VERSION=$(bash -c ". $TERMUX_SCRIPTDIR/packages/zig/build.sh; echo \$TERMUX_PKG_VERSION")
-		if ([ ! -e "$TERMUX_BUILT_PACKAGES_DIRECTORY/zig" ] ||
-		    [ "$(cat "$TERMUX_BUILT_PACKAGES_DIRECTORY/zig")" != "$ZIG_PKG_VERSION" ]) &&
-		   [ "$(dpkg-query -W -f '${db:Status-Status}\n' zig 2>/dev/null)" != "installed" ]; then
-			echo "Package 'zig' is not installed."
-			echo "You can install it with"
-			echo
-			echo "  pkg install zig"
-			echo
-			echo "or build it from source with"
-			echo
-			echo "  ./build-package.sh zig"
-			echo
+	if [[ "${TERMUX_ON_DEVICE_BUILD}" == "true" ]]; then
+		if [[ "$(cat "${TERMUX_BUILT_PACKAGES_DIRECTORY}/zig" 2>/dev/null)" != "${ZIG_PKG_VERSION}" && -z "$(command -v zig)" ]]; then
+			cat <<- EOL
+			Package 'zig' is not installed.
+			You can install it with
+
+			pkg install zig
+
+			or build it from source with
+
+			./build-package.sh zig
+			EOL
 			exit 1
 		fi
+		return
 	fi
 
-	if [ $TERMUX_ARCH = "i686" ]; then
-		ZIG_TARGET_NAME=i386-linux-android
-	else
-		ZIG_TARGET_NAME=$TERMUX_ARCH-linux-android
+	if [[ ! -x "${ZIG_FOLDER}/zig" ]]; then
+		mkdir -p "${ZIG_FOLDER}"
+		termux_download "${ZIG_TXZ_URL}" "${ZIG_TXZ_FILE}" "${ZIG_TXZ_SHA256}"
+		tar -xf "${ZIG_TXZ_FILE}" -C "${ZIG_FOLDER}" --strip-components=1
+	fi
+
+	export PATH="${ZIG_FOLDER}:${PATH}"
+	if [[ -z "$(command -v zig)" ]]; then
+		termux_error_exit "termux_setup_zig: No zig executable found!"
 	fi
 }