diff --git a/packages/hors/build.sh b/packages/hors/build.sh
index f8b4db15ea..cde73afb9c 100644
--- a/packages/hors/build.sh
+++ b/packages/hors/build.sh
@@ -3,13 +3,15 @@ TERMUX_PKG_DESCRIPTION="Instant coding answers via the command line (howdoi in r
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="Krishna Kanhaiya @kcubeterm"
 TERMUX_PKG_VERSION=0.8.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/WindSoilder/hors/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=22419b26f64a2793759d3a3616df58196897cd9227074f475aeb3e1c366296a9
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_pre_configure() {
-	if [ $TERMUX_ARCH = arm ]; then
+	if [ "$TERMUX_ARCH" = arm ]; then
+		termux_setup_gnu_as_23c
 		CFLAGS+=" -fno-integrated-as"
 	fi
 
diff --git a/packages/libffi/build.sh b/packages/libffi/build.sh
index cceb45dd86..c9cc5f23ec 100644
--- a/packages/libffi/build.sh
+++ b/packages/libffi/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Library providing a portable, high level programming int
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=3.4.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/libffi/libffi/releases/download/v${TERMUX_PKG_VERSION}/libffi-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620
 TERMUX_PKG_BREAKS="libffi-dev"
@@ -11,7 +12,8 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-multi-os-directory"
 TERMUX_PKG_RM_AFTER_INSTALL="lib/libffi-${TERMUX_PKG_VERSION}/include"
 
 termux_step_pre_configure() {
-	if [ $TERMUX_ARCH = arm ]; then
+	if [ "$TERMUX_ARCH" = arm ]; then
+		termux_setup_gnu_as_23c
 		CFLAGS+=" -fno-integrated-as"
 	fi
 }
diff --git a/packages/libgcrypt/build.sh b/packages/libgcrypt/build.sh
index 86f9a6afa1..44d2396adb 100644
--- a/packages/libgcrypt/build.sh
+++ b/packages/libgcrypt/build.sh
@@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="GPL-2.0, LGPL-2.1, BSD 3-Clause, MIT, Public Domain"
 TERMUX_PKG_LICENSE_FILE="COPYING, COPYING.LIB, LICENSES"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.10.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=ef14ae546b0084cd84259f61a55e07a38c3b53afc0f546bffcef2f01baffe9de
 TERMUX_PKG_DEPENDS="libgpg-error"
@@ -16,13 +17,14 @@ ac_cv_lib_pthread_pthread_create=yes
 "
 
 termux_step_pre_configure() {
-	CFLAGS+=" -no-integrated-as"
-	if [ $TERMUX_ARCH = "arm" ]; then
+	termux_setup_gnu_as_23c
+	CFLAGS+=" -fno-integrated-as"
+	if [ "$TERMUX_ARCH" = arm ]; then
 		# See http://marc.info/?l=gnupg-devel&m=139136972631909&w=3
 		CFLAGS+=" -mno-unaligned-access"
 		# Avoid text relocations:
 		TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" gcry_cv_gcc_inline_asm_neon=no"
-	elif [ $TERMUX_ARCH = "i686" ] || [ $TERMUX_ARCH = "x86_64" ]; then
+	elif [ "$TERMUX_ARCH" = i686 ] || [ "$TERMUX_ARCH" = x86_64 ]; then
 		# Fix i686 android build, also in https://bugzilla.gnome.org/show_bug.cgi?id=724050
 		TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-asm"
 	fi
diff --git a/packages/libpixman/build.sh b/packages/libpixman/build.sh
index 866b7f84a5..b69a3c5a3b 100644
--- a/packages/libpixman/build.sh
+++ b/packages/libpixman/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Low-level library for pixel manipulation"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=0.40.0
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://cairographics.org/releases/pixman-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc
 TERMUX_PKG_BREAKS="libpixman-dev"
@@ -11,7 +11,8 @@ TERMUX_PKG_REPLACES="libpixman-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-libpng"
 
 termux_step_pre_configure() {
-	if [ $TERMUX_ARCH = arm ]; then
+	if [ "$TERMUX_ARCH" = arm ]; then
+		termux_setup_gnu_as_23c
 		CFLAGS+=" -fno-integrated-as"
 	fi
 }
diff --git a/packages/openssl-1.1/build.sh b/packages/openssl-1.1/build.sh
index c37ddffdec..ced24f5753 100644
--- a/packages/openssl-1.1/build.sh
+++ b/packages/openssl-1.1/build.sh
@@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="custom"
 TERMUX_PKG_LICENSE_FILE="LICENSE"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.1.1o
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://www.openssl.org/source/openssl-${TERMUX_PKG_VERSION/\~/-}.tar.gz
 TERMUX_PKG_SHA256=9384a2b0570dd80358841464677115df785edb941c71211f75076d72fe6b438f
 TERMUX_PKG_DEPENDS="ca-certificates, zlib"
@@ -27,9 +28,6 @@ termux_step_configure() {
 	fi
 
 	CFLAGS+=" -DNO_SYSLOG"
-	if [ $TERMUX_ARCH = arm ]; then
-		CFLAGS+=" -fno-integrated-as"
-	fi
 
 	perl -p -i -e "s@TERMUX_CFLAGS@$CFLAGS@g" Configure
 	test $TERMUX_ARCH = "arm" && TERMUX_OPENSSL_PLATFORM="android-arm"
diff --git a/packages/openssl/build.sh b/packages/openssl/build.sh
index 204c8dc675..cb454673e3 100644
--- a/packages/openssl/build.sh
+++ b/packages/openssl/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Library implementing the SSL and TLS protocols as well a
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=3.0.3
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://www.openssl.org/source/openssl-${TERMUX_PKG_VERSION/\~/-}.tar.gz
 TERMUX_PKG_SHA256=ee0078adcef1de5f003c62c80cc96527721609c6f3bb42b7795df31f8b558c0b
 TERMUX_PKG_DEPENDS="ca-certificates, zlib"
@@ -21,9 +22,6 @@ termux_step_configure() {
 	fi
 
 	CFLAGS+=" -DNO_SYSLOG"
-	if [ $TERMUX_ARCH = arm ]; then
-		ASLAGS+=" -fno-integrated-as"
-	fi
 
 	perl -p -i -e "s@TERMUX_CFLAGS@$CFLAGS@g" Configure
 	rm -Rf $TERMUX_PREFIX/lib/libcrypto.* $TERMUX_PREFIX/lib/libssl.*