picolisp: Bump version

Also generate assembly using ersatz instead of downloading.

diff --git a/packages/picolisp/build.sh b/packages/picolisp/build.sh
index 6da6885..ac46ad5 100644 (file)
--- a/packages/picolisp/build.sh
+++ b/packages/picolisp/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Lisp interpreter and application server framework"
 TERMUX_PKG_DEPENDS="libcrypt, openssl"
 _PICOLISP_YEAR=16
 _PICOLISP_MONTH=6
-_PICOLISP_DAY=19
+_PICOLISP_DAY=21
 TERMUX_PKG_VERSION=${_PICOLISP_YEAR}.${_PICOLISP_MONTH}.${_PICOLISP_DAY}
 TERMUX_PKG_SRCURL=http://software-lab.de/picoLisp.tgz
 TERMUX_PKG_NO_SRC_CACHE=yes
@@ -22,12 +22,8 @@ termux_step_pre_configure() {
                cd $TERMUX_PKG_SRCDIR
                if [ $TERMUX_ARCH = "aarch64" ]; then
                        export TERMUX_PKG_EXTRA_MAKE_ARGS=arm64.linux
-                       termux_download http://software-lab.de/arm64.linux.tgz $TERMUX_PKG_TMPDIR/arm64.linux.tgz
-                       tar xf $TERMUX_PKG_TMPDIR/arm64.linux.tgz
                elif [ $TERMUX_ARCH = "x86_64" ]; then
                        export TERMUX_PKG_EXTRA_MAKE_ARGS=x86-64.linux
-                       termux_download http://software-lab.de/x86-64.linux.tgz $TERMUX_PKG_TMPDIR/x86-64.linux.tgz
-                       tar xf $TERMUX_PKG_TMPDIR/x86-64.linux.tgz
                else
                        echo "Error: Unsupported arch: $TERMUX_ARCH"
                        exit 1

diff --git a/packages/picolisp/src64-mkAsm.patch b/packages/picolisp/src64-mkAsm.patch
new file mode 100644 (file)
index 0000000..519a3ce
--- /dev/null
+++ b/packages/picolisp/src64-mkAsm.patch
@@ -0,0 +1,22 @@
+Avoid trying to run /usr/bin/picolisp since it is probably too
+old - just run the java version, since java is needed by the
+Termux package builds anyway.
+
+diff -u -r ../picoLisp/src64/mkAsm ./src64/mkAsm
+--- ../picoLisp/src64/mkAsm    2011-06-08 12:49:19.000000000 -0400
++++ ./src64/mkAsm      2016-06-21 16:23:47.625814914 -0400
+@@ -1,14 +1,6 @@
+ #!/bin/sh
+ # 08jun11abu
+ 
+-if test -x /usr/bin/picolisp
+-then
+-   /usr/bin/pil mkAsm.l "$@"
+-elif test -x ../bin/picolisp
+-then
+-   ../pil mkAsm.l "$@"
+-else
+    ../ersatz/pil mkAsm.l "$@"
+-fi
+ 
+ # vi:et:ts=3:sw=3