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

diff --git a/packages/picolisp/build.sh b/packages/picolisp/build.sh
index 75d8324a..f4d18d99 100644
--- a/packages/picolisp/build.sh
+++ b/packages/picolisp/build.sh
@@ -1,13 +1,13 @@
-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=16
-_PICOLISP_MONTH=12
-_PICOLISP_DAY=22
+_PICOLISP_YEAR=17
+_PICOLISP_MONTH=7
+_PICOLISP_DAY=9
 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=https://dl.bintray.com/termux/upstream/picolisp_${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=af64df40f87a0dfbdb1f61e1b319d96a07feed123175fc0d17a849f03c36b26a
+TERMUX_PKG_SHA256=22eff19214f3250099935dc871045a5be6728724ad91a0534b9c29bcd8fde858
 TERMUX_PKG_FOLDERNAME=picoLisp
 TERMUX_PKG_BUILD_IN_SRC=true
 # The assembly is not position-independent (would be a major rewrite):
@@ -20,9 +20,7 @@ fi
 termux_step_pre_configure() {
 	# Validate that we have the right version:
 	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_error_exit "Picolisp version needs to be bumped"
 	}
 
 	if [ $TERMUX_ARCH_BITS = 64 ]; then
@@ -32,8 +30,7 @@ termux_step_pre_configure() {
 		elif [ $TERMUX_ARCH = "x86_64" ]; then
 			export TERMUX_PKG_EXTRA_MAKE_ARGS=x86-64.linux
 		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
@@ -48,10 +45,18 @@ termux_step_make_install () {
 	cd $TERMUX_PKG_SRCDIR/
 
 	if [ $TERMUX_ARCH_BITS = "64" ]; then
-		$CC -fno-integrated-as -pie -o ../bin/picolisp -rdynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.base.s -lc -lm -ldl
+		$TERMUX_HOST_PLATFORM-as -o ${TERMUX_PKG_EXTRA_MAKE_ARGS}.base.o ${TERMUX_PKG_EXTRA_MAKE_ARGS}.base.s
+		$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 -fuse-ld=bfd
 		chmod +x ../bin/picolisp
-		$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
+		$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