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

diff --git a/packages/picolisp/build.sh b/packages/picolisp/build.sh
index ce481bfb..bd29b2b3 100644
--- a/packages/picolisp/build.sh
+++ b/packages/picolisp/build.sh
@@ -1,34 +1,28 @@
 TERMUX_PKG_HOMEPAGE=https://picolisp.com
 TERMUX_PKG_DESCRIPTION="Lisp interpreter and application server framework"
 TERMUX_PKG_DEPENDS="libcrypt, openssl"
-_PICOLISP_YEAR=17
-_PICOLISP_MONTH=8
-_PICOLISP_DAY=7
-TERMUX_PKG_VERSION=${_PICOLISP_YEAR}.${_PICOLISP_MONTH}.${_PICOLISP_DAY}
+TERMUX_PKG_VERSION=17.11.29
+TERMUX_PKG_SHA256=21d62e05ce1b087848eda810a532d7c3190b4f8d8e80a8f40837d8836950eea0
 # 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=7db7f2ce7c06b07ac6e74f156462de4b6e5181fa3912a922da27447afa3197df
-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
+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:
-	grep -q "Version $_PICOLISP_YEAR $_PICOLISP_MONTH $_PICOLISP_DAY" src64/version.l || {
+	grep -q "Version ${TERMUX_PKG_VERSION//./ }" src64/version.l || {
 		termux_error_exit "Picolisp version needs to be bumped"
 	}
 
 	if [ $TERMUX_ARCH_BITS = 64 ]; then
 		cd $TERMUX_PKG_SRCDIR
 		if [ $TERMUX_ARCH = "aarch64" ]; then
-			export TERMUX_PKG_EXTRA_MAKE_ARGS=arm64.linux
-		elif [ $TERMUX_ARCH = "x86_64" ]; then
-			export TERMUX_PKG_EXTRA_MAKE_ARGS=x86-64.linux
+			export TERMUX_PKG_EXTRA_MAKE_ARGS=arm64.android
 		else
 			termux_error_exit "Unsupported arch: $TERMUX_ARCH"
 		fi