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

diff --git a/packages/picolisp/build.sh b/packages/picolisp/build.sh
index 0df34339..1842f6b4 100644
--- a/packages/picolisp/build.sh
+++ b/packages/picolisp/build.sh
@@ -1,42 +1,28 @@
-TERMUX_PKG_HOMEPAGE=http://picolisp.com
+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=4
-_PICOLISP_DAY=7
-TERMUX_PKG_VERSION=${_PICOLISP_YEAR}.${_PICOLISP_MONTH}.${_PICOLISP_DAY}
+TERMUX_PKG_VERSION=18.4.26
+TERMUX_PKG_SHA256=07bdad20320fc5b5c31110c221270b1bbd221078eed27ed1d5a188c4699520ba
 # 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=29c9f6c5522ebeb11c167fa37242940f4e598e921a7a1d242bcf57669c62d744
-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
-else
-	# FIXME: Use gcc for linking, as a clang build causes (tzo),
-	# the time zone offset, to return 0:
-	# Also, this call (and probably more) hangs:
-	# (call "termux-notification" "--title" "Title" "--content" "Message")
-	# These two problems only happen when using the gold linker, which
-	# Termux does by default).
-	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
@@ -57,11 +43,14 @@ termux_step_make_install () {
 		$TERMUX_HOST_PLATFORM-as -o ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ext.o ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ext.s
 		$TERMUX_HOST_PLATFORM-as -o ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ht.o ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ht.s
 
+		# Use -fuse-ld=bfd to avoid using the gold linker (which Termux
+		# patches NDK to use by default) as it causes (tzo), the time
+		# zone offset, to always be 0 (and probably other problems):
 		$CC -o ../bin/picolisp ${TERMUX_PKG_EXTRA_MAKE_ARGS}.base.o \
-			-Wl,--no-as-needed -rdynamic -lc -lm -ldl -pie
+			-Wl,--no-as-needed -rdynamic -lc -lm -ldl -pie -fuse-ld=bfd
 		chmod +x ../bin/picolisp
-		$CC -o ../lib/ext -shared -rdynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ext.o
-		$CC -o ../lib/ht -shared -rdynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ht.o
+		$CC -o ../lib/ext -shared -rdynamic -fuse-ld=bfd ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ext.o
+		$CC -o ../lib/ht -shared -rdynamic -fuse-ld=bfd ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ht.o
 	fi
 
 	mkdir -p $TERMUX_PREFIX/share/man/man1