picolisp: Update from 16.9.6 to 16.10.3

[termux-packages] / packages / picolisp / build.sh

diff --git a/packages/picolisp/build.sh b/packages/picolisp/build.sh
index aac0d19..099f0d4 100644 (file)
--- a/packages/picolisp/build.sh
+++ b/packages/picolisp/build.sh
@@ -1,19 +1,29 @@
 TERMUX_PKG_HOMEPAGE=http://picolisp.com
 TERMUX_PKG_DESCRIPTION="Lisp interpreter and application server framework"
 TERMUX_PKG_DEPENDS="libcrypt, openssl"
-TERMUX_PKG_VERSION=16.4.1
-TERMUX_PKG_BUILD_REVISION=1
-TERMUX_PKG_SRCURL=http://software-lab.de/picoLisp.tgz
+_PICOLISP_YEAR=16
+_PICOLISP_MONTH=10
+_PICOLISP_DAY=3
+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=http://software-lab.de/picoLisp.tgz
+TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/picolisp_${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=567f05ae4b1bd56e62166374b32ac912bf2a70d59117b2bf595d59ea4a5b1bd4
 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"
 
 termux_step_pre_configure() {
        # Validate that we have the right version:
-       grep -q '16 4 1' src64/version.l
+       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_PKG_SRCDIR=$TERMUX_PKG_SRCDIR/src
        if [ $TERMUX_ARCH_BITS = 64 ]; then
-               TERMUX_PKG_SRCDIR+="64"
+               cd $TERMUX_PKG_SRCDIR
                if [ $TERMUX_ARCH = "aarch64" ]; then
                        export TERMUX_PKG_EXTRA_MAKE_ARGS=arm64.linux
                elif [ $TERMUX_ARCH = "x86_64" ]; then
@@ -22,6 +32,9 @@ termux_step_pre_configure() {
                        echo "Error: Unsupported arch: $TERMUX_ARCH"
                        exit 1
                fi
+               TERMUX_PKG_SRCDIR=$TERMUX_PKG_SRCDIR/src64
+       else
+               TERMUX_PKG_SRCDIR=$TERMUX_PKG_SRCDIR/src
        fi
        TERMUX_PKG_BUILDDIR=$TERMUX_PKG_SRCDIR
        ORIG_CFLAGS="$CFLAGS"
@@ -32,10 +45,10 @@ 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
+               $AS -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
+               $AS -pie -o ../lib/ext -shared -export-dynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ext.s
+               $AS -pie -o ../lib/ht -shared -export-dynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ht.s
        fi
 
        mkdir -p $TERMUX_PREFIX/share/man/man1
@@ -45,7 +58,7 @@ termux_step_make_install () {
        mkdir -p $TERMUX_PREFIX/lib/picolisp
 
        cp -Rf $TERMUX_PKG_SRCDIR/../* $TERMUX_PREFIX/lib/picolisp/
-       rm -Rf $TERMUX_PREFIX/lib/picolisp/{src,src64,man,java,ersatz}
+       rm -Rf $TERMUX_PREFIX/lib/picolisp/{src,man,java,ersatz}
 
        # Replace first line "#!/usr/bin/picolisp /usr/lib/picolisp/lib.l":
        sed -i "1 s|^.*$|#!$TERMUX_PREFIX/bin/picolisp $TERMUX_PREFIX/lib/picolisp/lib.l|g" $TERMUX_PREFIX/lib/picolisp/bin/pil
@@ -53,9 +66,9 @@ termux_step_make_install () {
        ( 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/bin/ssl ../src/ssl.c -lssl -lcrypto
-       $CC $ORIG_CFLAGS $CPPFLAGS $LDFLAGS -o $TERMUX_PREFIX/bin/httpGate ../src/httpGate.c -lssl -lcrypto
+       $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/picolisp}.1 $TERMUX_PREFIX/share/man/man1/
+       cp $TERMUX_PKG_SRCDIR/../man/man1/{pil,picolisp}.1 $TERMUX_PREFIX/share/man/man1/
 }