picolisp: Update from 18.1.24 to 18.4.26

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

diff --git a/packages/picolisp/build.sh b/packages/picolisp/build.sh
index 72b00c6..1842f6b 100644 (file)
--- a/packages/picolisp/build.sh
+++ b/packages/picolisp/build.sh
@@ -1,37 +1,56 @@
-TERMUX_PKG_HOMEPAGE=http://picolisp.com
+TERMUX_PKG_HOMEPAGE=https://picolisp.com
 TERMUX_PKG_DESCRIPTION="Lisp interpreter and application server framework"
-TERMUX_PKG_VERSION=16.3.1
-TERMUX_PKG_SRCURL=http://software-lab.de/picoLisp.tgz
-TERMUX_PKG_FOLDERNAME=picoLisp
+TERMUX_PKG_DEPENDS="libcrypt, openssl"
+TERMUX_PKG_VERSION=18.4.26
+TERMUX_PKG_SHA256=07bdad20320fc5b5c31110c221270b1bbd221078eed27ed1d5a188c4699520ba
+# 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_BUILD_IN_SRC=true
+# The assembly is not position-independent (would be a major rewrite):
+TERMUX_PKG_BLACKLISTED_ARCHES="x86_64"
+if [ "$TERMUX_ARCH_BITS" = 32 ]; then
+       # "Variable length array in structure won't be supported"
+       TERMUX_PKG_CLANG=no
+fi
 
 termux_step_pre_configure() {
        # Validate that we have the right version:
-       grep -q '16 3 1' src64/version.l
+       grep -q "Version ${TERMUX_PKG_VERSION//./ }" src64/version.l || {
+               termux_error_exit "Picolisp version needs to be bumped"
+       }
 
-       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
-                       export TERMUX_PKG_EXTRA_MAKE_ARGS=x86-64.linux
+                       export TERMUX_PKG_EXTRA_MAKE_ARGS=arm64.android
                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
+               TERMUX_PKG_SRCDIR=$TERMUX_PKG_SRCDIR/src
        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
-               cd $TERMUX_PKG_SRCDIR/
-               $CC -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 -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
+               $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
@@ -41,10 +60,17 @@ 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
 
        ( 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/
 }