Use termux_error_exit in more cases

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

diff --git a/packages/picolisp/build.sh b/packages/picolisp/build.sh
index 902c3f0..82e04c7 100644 (file)
--- a/packages/picolisp/build.sh
+++ b/packages/picolisp/build.sh
@@ -1,35 +1,67 @@
 TERMUX_PKG_HOMEPAGE=http://picolisp.com
 TERMUX_PKG_DESCRIPTION="Lisp interpreter and application server framework"
-TERMUX_PKG_VERSION=15.11
-TERMUX_PKG_BUILD_REVISION=1
-TERMUX_PKG_SRCURL=http://software-lab.de/picoLisp-${TERMUX_PKG_VERSION}.tgz
+TERMUX_PKG_DEPENDS="libcrypt, openssl"
+_PICOLISP_YEAR=17
+_PICOLISP_MONTH=2
+_PICOLISP_DAY=24
+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=https://dl.bintray.com/termux/upstream/picolisp_${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=900100713c07a924fd53ea4fe6ff7cbf216423e98e2137ffdac86b85cbcf24c8
 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"
+if [ $TERMUX_ARCH_BITS = 32 ]; then
+       # "Variable length array in structure won't be supported"
+       TERMUX_PKG_CLANG=no
+else
+       # FIXME: Use gcc for linking, as a clang build causes (tzo),
+       # the time zone offset, to return 0:
+       # Also, this call (and probably more) hangs:
+       # (call "termux-notification" "--title" "Title" "--content" "Message")
+       # These two problems only happen when using the gold linker, which
+       # Termux does by default).
+       TERMUX_PKG_CLANG=no
+fi
 
 termux_step_pre_configure() {
-       TERMUX_PKG_SRCDIR=$TERMUX_PKG_SRCDIR/src
+       # Validate that we have the right version:
+       grep -q "Version $_PICOLISP_YEAR $_PICOLISP_MONTH $_PICOLISP_DAY" src64/version.l || {
+               termux_error_exit "Picolisp version needs to be bumped"
+       }
+
        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
                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
+
+               $CC -o ../bin/picolisp ${TERMUX_PKG_EXTRA_MAKE_ARGS}.base.o \
+                       -Wl,--no-as-needed -rdynamic -lc -lm -ldl -pie
                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 ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ext.o
+               $CC -o ../lib/ht -shared -rdynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ht.o
        fi
 
        mkdir -p $TERMUX_PREFIX/share/man/man1
@@ -39,10 +71,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/
 }