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

diff --git a/packages/picolisp/build.sh b/packages/picolisp/build.sh
index 9601c75a..0c3788eb 100644
--- a/packages/picolisp/build.sh
+++ b/packages/picolisp/build.sh
@@ -1,17 +1,44 @@
 TERMUX_PKG_HOMEPAGE=http://picolisp.com
 TERMUX_PKG_DESCRIPTION="Lisp interpreter and application server framework"
-TERMUX_PKG_VERSION=3.1.11
-TERMUX_PKG_SRCURL=http://software-lab.de/picoLisp-${TERMUX_PKG_VERSION}.tgz
+TERMUX_PKG_DEPENDS="libcrypt, openssl"
+TERMUX_PKG_VERSION=16.4.1
+TERMUX_PKG_BUILD_REVISION=2
+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 4 1' src64/version.l
+
 	TERMUX_PKG_SRCDIR=$TERMUX_PKG_SRCDIR/src
+	if [ $TERMUX_ARCH_BITS = 64 ]; then
+		TERMUX_PKG_SRCDIR+="64"
+		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
+		else
+			echo "Error: Unsupported arch: $TERMUX_ARCH"
+			exit 1
+		fi
+	fi
 	TERMUX_PKG_BUILDDIR=$TERMUX_PKG_SRCDIR
+	ORIG_CFLAGS="$CFLAGS"
 	CFLAGS+=" -c $LDFLAGS $CPPFLAGS"
 }
 
 termux_step_make_install () {
+	cd $TERMUX_PKG_SRCDIR/
+
+	if [ $TERMUX_ARCH_BITS = "64" ]; then
+		$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/
 
 	rm -Rf $TERMUX_PREFIX/lib/picolisp
@@ -24,4 +51,11 @@ termux_step_make_install () {
 	sed -i "1 s|^.*$|#!$TERMUX_PREFIX/bin/picolisp $TERMUX_PREFIX/lib/picolisp/lib.l|g" $TERMUX_PREFIX/lib/picolisp/bin/pil
 
 	( cd $TERMUX_PREFIX/bin && ln -f -s ../lib/picolisp/bin/picolisp picolisp && ln -f -s ../lib/picolisp/bin/pil pil )
+
+	# Bundled tools:
+	$CC $ORIG_CFLAGS $CPPFLAGS $LDFLAGS -o $TERMUX_PREFIX/lib/picolisp/bin/ssl ../src/ssl.c -lssl -lcrypto
+	$CC $ORIG_CFLAGS $CPPFLAGS $LDFLAGS -o $TERMUX_PREFIX/lib/picolisp/bin/httpGate ../src/httpGate.c -lssl -lcrypto
+
+	# Man pages:
+	cp $TERMUX_PKG_SRCDIR/../man/man1/{pil,picolisp}.1 $TERMUX_PREFIX/share/man/man1/
 }