X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/96b43247d5814fa1a13eceaa70b700d1cfb4c278..538fab5db5316e970860a8fd1c6f113f98ea8885:/packages/picolisp/build.sh

diff --git a/packages/picolisp/build.sh b/packages/picolisp/build.sh
index 6d2b2d82..75d8324a 100644
--- a/packages/picolisp/build.sh
+++ b/packages/picolisp/build.sh
@@ -2,17 +2,20 @@ TERMUX_PKG_HOMEPAGE=http://picolisp.com
 TERMUX_PKG_DESCRIPTION="Lisp interpreter and application server framework"
 TERMUX_PKG_DEPENDS="libcrypt, openssl"
 _PICOLISP_YEAR=16
-_PICOLISP_MONTH=9
-_PICOLISP_DAY=6
+_PICOLISP_MONTH=12
+_PICOLISP_DAY=22
 TERMUX_PKG_VERSION=${_PICOLISP_YEAR}.${_PICOLISP_MONTH}.${_PICOLISP_DAY}
 # We use our bintray mirror since old version snapshots are not kept on main site.
-# TERMUX_PKG_SRCURL=http://software-lab.de/picoLisp.tgz
 TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/picolisp_${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=f8559112db9b8984e961c257fb7327705434c9f3c4e3f5bc745d4d726ef7094a
+TERMUX_PKG_SHA256=af64df40f87a0dfbdb1f61e1b319d96a07feed123175fc0d17a849f03c36b26a
 TERMUX_PKG_FOLDERNAME=picoLisp
 TERMUX_PKG_BUILD_IN_SRC=true
 # The assembly is not position-independent (would be a major rewrite):
 TERMUX_PKG_BLACKLISTED_ARCHES="x86_64"
+if [ $TERMUX_ARCH_BITS = 32 ]; then
+	# "Variable length array in structure won't be supported"
+	TERMUX_PKG_CLANG=no
+fi
 
 termux_step_pre_configure() {
 	# Validate that we have the right version:
@@ -45,10 +48,10 @@ termux_step_make_install () {
 	cd $TERMUX_PKG_SRCDIR/
 
 	if [ $TERMUX_ARCH_BITS = "64" ]; then
-		$AS -pie -o ../bin/picolisp -rdynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.base.s -lc -lm -ldl
+		$CC -fno-integrated-as -pie -o ../bin/picolisp -rdynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.base.s -lc -lm -ldl
 		chmod +x ../bin/picolisp
-		$AS -pie -o ../lib/ext -shared -export-dynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ext.s
-		$AS -pie -o ../lib/ht -shared -export-dynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ht.s
+		$CC -fno-integrated-as -pie -o ../lib/ext -shared -export-dynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ext.s
+		$CC -fno-integrated-as -pie -o ../lib/ht -shared -export-dynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ht.s
 	fi
 
 	mkdir -p $TERMUX_PREFIX/share/man/man1