X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/9fb3cdee189d512d3d002c1006f4518faa277541..6b56911d9c8c03609525ef63eea99882f6b6edb0:/packages/picolisp/build.sh

diff --git a/packages/picolisp/build.sh b/packages/picolisp/build.sh
index 6da6885f..b1cf2f42 100644
--- a/packages/picolisp/build.sh
+++ b/packages/picolisp/build.sh
@@ -1,14 +1,21 @@
 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=6
-_PICOLISP_DAY=19
+_PICOLISP_YEAR=17
+_PICOLISP_MONTH=1
+_PICOLISP_DAY=23
 TERMUX_PKG_VERSION=${_PICOLISP_YEAR}.${_PICOLISP_MONTH}.${_PICOLISP_DAY}
-TERMUX_PKG_SRCURL=http://software-lab.de/picoLisp.tgz
-TERMUX_PKG_NO_SRC_CACHE=yes
+# We use our bintray mirror since old version snapshots are not kept on main site.
+TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/picolisp_${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=35f9264c9665d4247033e8d86f7fc31285621aee08009f77691e065c629c3ffd
 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:
@@ -22,15 +29,10 @@ termux_step_pre_configure() {
 		cd $TERMUX_PKG_SRCDIR
 		if [ $TERMUX_ARCH = "aarch64" ]; then
 			export TERMUX_PKG_EXTRA_MAKE_ARGS=arm64.linux
-			termux_download http://software-lab.de/arm64.linux.tgz $TERMUX_PKG_TMPDIR/arm64.linux.tgz
-			tar xf $TERMUX_PKG_TMPDIR/arm64.linux.tgz
 		elif [ $TERMUX_ARCH = "x86_64" ]; then
 			export TERMUX_PKG_EXTRA_MAKE_ARGS=x86-64.linux
-			termux_download http://software-lab.de/x86-64.linux.tgz $TERMUX_PKG_TMPDIR/x86-64.linux.tgz
-			tar xf $TERMUX_PKG_TMPDIR/x86-64.linux.tgz
 		else
-			echo "Error: Unsupported arch: $TERMUX_ARCH"
-			exit 1
+			termux_error_exit "Unsupported arch: $TERMUX_ARCH"
 		fi
 		TERMUX_PKG_SRCDIR=$TERMUX_PKG_SRCDIR/src64
 	else
@@ -45,10 +47,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
@@ -58,7 +60,7 @@ termux_step_make_install () {
 	mkdir -p $TERMUX_PREFIX/lib/picolisp
 
 	cp -Rf $TERMUX_PKG_SRCDIR/../* $TERMUX_PREFIX/lib/picolisp/
-	rm -Rf $TERMUX_PREFIX/lib/picolisp/{src,src64,man,java,ersatz}
+	rm -Rf $TERMUX_PREFIX/lib/picolisp/{src,man,java,ersatz}
 
 	# Replace first line "#!/usr/bin/picolisp /usr/lib/picolisp/lib.l":
 	sed -i "1 s|^.*$|#!$TERMUX_PREFIX/bin/picolisp $TERMUX_PREFIX/lib/picolisp/lib.l|g" $TERMUX_PREFIX/lib/picolisp/bin/pil