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

diff --git a/packages/picolisp/build.sh b/packages/picolisp/build.sh
index d375310a..d1a8d5d3 100644
--- a/packages/picolisp/build.sh
+++ b/packages/picolisp/build.sh
@@ -1,11 +1,14 @@
 TERMUX_PKG_HOMEPAGE=http://picolisp.com
 TERMUX_PKG_DESCRIPTION="Lisp interpreter and application server framework"
-TERMUX_PKG_VERSION=15.11
-TERMUX_PKG_SRCURL=http://software-lab.de/picoLisp-${TERMUX_PKG_VERSION}.tgz
+TERMUX_PKG_VERSION=16.2.11
+TERMUX_PKG_SRCURL=http://software-lab.de/picoLisp.tgz
 TERMUX_PKG_FOLDERNAME=picoLisp
 TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_pre_configure() {
+	# Validate that we have the right version:
+	grep -q '16 2 11' src64/version.l
+
 	TERMUX_PKG_SRCDIR=$TERMUX_PKG_SRCDIR/src
 	if [ $TERMUX_ARCH_BITS = 64 ]; then
 		TERMUX_PKG_SRCDIR+="64"
@@ -20,10 +23,17 @@ termux_step_pre_configure() {
 	fi
 	TERMUX_PKG_BUILDDIR=$TERMUX_PKG_SRCDIR
 	CFLAGS+=" -c $LDFLAGS $CPPFLAGS"
-
 }
 
 termux_step_make_install () {
+	if [ $TERMUX_ARCH_BITS = "64" ]; then
+		cd $TERMUX_PKG_SRCDIR/
+		$CC -pie -o ../bin/picolisp -rdynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.base.s -lc -lm -ldl
+		chmod +x ../bin/picolisp
+		$CC -pie -o ../lib/ext -shared -export-dynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ext.s
+		$CC --pie -o ../lib/ht -shared -export-dynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ht.s
+	fi
+
 	mkdir -p $TERMUX_PREFIX/share/man/man1
 	cp $TERMUX_PKG_SRCDIR/../man/man1/{pil,picolisp}.1 $TERMUX_PREFIX/share/man/man1/