Prepare more packages for clang

packages/gnupg/build.sh

@@ -11,4 +11,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-endian-check --without-readline ac_cv
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_header_sys_shm_h=no"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-bzip2"
 
-CFLAGS+=" -D__LITTLE_ENDIAN__"
+termux_step_pre_configure() {
+	CFLAGS+=" -D__LITTLE_ENDIAN__"
+}

packages/gnupg2/build.sh

@@ -7,4 +7,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-ldap --disable-sqlite"
 # Remove non-english help files and man pages shipped with the gnupg (1) package:
 TERMUX_PKG_RM_AFTER_INSTALL="share/gnupg/help.*.txt share/man/man1/gpg-zip.1 share/man/man7/gnupg.7"
 
-CPPFLAGS+=" -Ddn_skipname=__dn_skipname"
+termux_step_pre_configure() {
+	CPPFLAGS+=" -Ddn_skipname=__dn_skipname"
+}

packages/htop/build.sh

@@ -1,12 +1,9 @@
 TERMUX_PKG_HOMEPAGE=http://hisham.hm/htop/
 TERMUX_PKG_DESCRIPTION="Interactive process viewer for Linux"
+# htop checks setlocale() return value for UTF-8 support, so use libandroid-support.
 TERMUX_PKG_DEPENDS="ncurses, libandroid-support"
 TERMUX_PKG_VERSION=2.0.2
 TERMUX_PKG_SRCURL=http://hisham.hm/htop/releases/${TERMUX_PKG_VERSION}/htop-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_BUILD_IN_SRC="yes"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_lib_ncursesw6_addnwstr=yes"
 TERMUX_PKG_RM_AFTER_INSTALL="share/applications share/pixmaps"
-
-# htop checks setlocale() return value for UTF-8 support, so use libandroid-support.
-export CPPFLAGS="$CPPFLAGS -isystem $TERMUX_PREFIX/include/libandroid-support"
-export LDFLAGS="$LDFLAGS -landroid-support"

packages/libev/build.sh

@@ -3,4 +3,6 @@ TERMUX_PKG_DESCRIPTION="Full-featured and high-performance event loop library"
 TERMUX_PKG_VERSION=4.22
 TERMUX_PKG_SRCURL=http://dist.schmorp.de/libev/libev-${TERMUX_PKG_VERSION}.tar.gz
 
-CFLAGS+=" -Dfd_mask=int"
+termux_step_pre_configure() {
+	CFLAGS+=" -Dfd_mask=int"
+}

packages/mc/build.sh

@@ -4,6 +4,9 @@ TERMUX_PKG_DESCRIPTION="Midnight Commander - a powerful file manager"
 TERMUX_PKG_SRCURL="http://ftp.midnight-commander.org/mc-${TERMUX_PKG_VERSION}.tar.xz"
 TERMUX_PKG_DEPENDS="libandroid-support, ncurses, glib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ncurses-libs=$TERMUX_PREFIX/lib --with-screen=ncurses"
-# mc uses the deprecated S_IWRITE definition, which android does not define:
-# https://code.google.com/p/android/issues/detail?id=19710
-CPPFLAGS="$CPPFLAGS -DS_IWRITE=S_IWUSR"
+
+termux_step_pre_configure() {
+	# mc uses the deprecated S_IWRITE definition, which android does not define:
+	# https://code.google.com/p/android/issues/detail?id=19710
+	CPPFLAGS+=" -DS_IWRITE=S_IWUSR"
+}

packages/nmap/build.sh

@@ -12,7 +12,6 @@ TERMUX_PKG_DEPENDS="libpcap, pcre, openssl, resolv-conf, netcat"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-static --with-liblua=included --without-nmap-update --without-zenmap --without-ndiff"
 TERMUX_PKG_BUILD_IN_SRC="yes"
 
-
 termux_step_post_make_install () {
 	# Setup 'netcat' and 'nc' as symlink to 'ncat', since the other netcat implementations
 	# are outdated (gnu-netcat) or non-portable (openbsd-netcat).

packages/php/build.sh

@@ -34,9 +34,9 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-calendar"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-exif"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-bz2=$TERMUX_PREFIX"
 
-LDFLAGS+=" -landroid-glob"
-
 termux_step_pre_configure () {
+	LDFLAGS+=" -landroid-glob"
+
 	export PATH=$PATH:$TERMUX_PKG_HOSTBUILD_DIR/sapi/cli/
 	export NATIVE_PHP_EXECUTABLE=$TERMUX_PKG_HOSTBUILD_DIR/sapi/cli/php
 

packages/taskwarrior/build.sh

@@ -4,7 +4,9 @@ TERMUX_PKG_VERSION=2.5.1
 TERMUX_PKG_SRCURL=https://taskwarrior.org/download/task-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="libgnutls, libuuid, libandroid-glob"
 
-LDFLAGS+=" -landroid-glob"
+termux_step_pre_configure() {
+	LDFLAGS+=" -landroid-glob"
+}
 
 termux_step_configure () {
 	cd $TERMUX_PKG_BUILDDIR