X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/bb5cfa8c9d55ae9ba0ea097426d1ae3a4d4174a0..ed66b8ab12d68636f2378b15d04b61a1bc96fb3f:/packages/picolisp/build.sh

diff --git a/packages/picolisp/build.sh b/packages/picolisp/build.sh
index 83e641b7..e60e6652 100644
--- a/packages/picolisp/build.sh
+++ b/packages/picolisp/build.sh
@@ -2,20 +2,26 @@ 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=5
-_PICOLISP_DAY=13
+_PICOLISP_MONTH=8
+_PICOLISP_DAY=1
 TERMUX_PKG_VERSION=${_PICOLISP_YEAR}.${_PICOLISP_MONTH}.${_PICOLISP_DAY}
 TERMUX_PKG_SRCURL=http://software-lab.de/picoLisp.tgz
+TERMUX_PKG_NO_SRC_CACHE=yes
 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"
 
 termux_step_pre_configure() {
 	# Validate that we have the right version:
-	grep -q "$_PICOLISP_YEAR $_PICOLISP_MONTH $_PICOLISP_DAY" src64/version.l
+	grep -q "Version $_PICOLISP_YEAR $_PICOLISP_MONTH $_PICOLISP_DAY" src64/version.l || {
+		echo "ERROR: Picolisp version needs to be bumped" 1>&2
+		grep Version src64/version.l 1>&2
+		exit 1
+	}
 
-	TERMUX_PKG_SRCDIR=$TERMUX_PKG_SRCDIR/src
 	if [ $TERMUX_ARCH_BITS = 64 ]; then
-		TERMUX_PKG_SRCDIR+="64"
+		cd $TERMUX_PKG_SRCDIR
 		if [ $TERMUX_ARCH = "aarch64" ]; then
 			export TERMUX_PKG_EXTRA_MAKE_ARGS=arm64.linux
 		elif [ $TERMUX_ARCH = "x86_64" ]; then
@@ -24,6 +30,9 @@ termux_step_pre_configure() {
 			echo "Error: Unsupported arch: $TERMUX_ARCH"
 			exit 1
 		fi
+		TERMUX_PKG_SRCDIR=$TERMUX_PKG_SRCDIR/src64
+	else
+		TERMUX_PKG_SRCDIR=$TERMUX_PKG_SRCDIR/src
 	fi
 	TERMUX_PKG_BUILDDIR=$TERMUX_PKG_SRCDIR
 	ORIG_CFLAGS="$CFLAGS"
@@ -37,7 +46,7 @@ termux_step_make_install () {
 		$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
+		$AS -pie -o ../lib/ht -shared -export-dynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ht.s
 	fi
 
 	mkdir -p $TERMUX_PREFIX/share/man/man1