diff --git a/packages/picolisp/build.sh b/packages/picolisp/build.sh index 309a81731..b93557f35 100644 --- a/packages/picolisp/build.sh +++ b/packages/picolisp/build.sh @@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://picolisp.com TERMUX_PKG_DESCRIPTION="Lisp interpreter and application server framework" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_DEPENDS="libcrypt, openssl" -TERMUX_PKG_VERSION=18.12.27 -TERMUX_PKG_SHA256=13669b17e726b00e3f73578b817a47bc9ebd6b2fc962894489730dc0b6c06f43 +TERMUX_PKG_VERSION=19.7.6 +TERMUX_PKG_SHA256=0e665aad4f58d79dd1cab44cb16eaf2475116efa0b0f1ac9e7348c746b02d1f7 # 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 diff --git a/packages/picolisp/src-Makefile.patch b/packages/picolisp/src-Makefile.patch index b5a7f7a09..8140597b0 100644 --- a/packages/picolisp/src-Makefile.patch +++ b/packages/picolisp/src-Makefile.patch @@ -1,6 +1,6 @@ diff -u -r ../picoLisp/src/Makefile ./src/Makefile ---- ../picoLisp/src/Makefile 2017-10-04 09:22:44.000000000 +0200 -+++ ./src/Makefile 2017-10-28 23:38:13.679734200 +0200 +--- ../picoLisp/src/Makefile 2019-01-30 14:32:00.000000000 +0000 ++++ ./src/Makefile 2019-07-16 12:35:22.543000406 +0000 @@ -6,121 +6,17 @@ picoFiles = main.c gc.c apply.c flow.c sym.c subr.c big.c io.c net.c tab.c @@ -8,16 +8,16 @@ diff -u -r ../picoLisp/src/Makefile ./src/Makefile -CC = gcc # CCLD is the cc (compiler frontend) to use for the link step. -CCLD = gcc - +- +CCLD = $(CC) +LCRYPT = -lcrypt +PICOLISP-FLAGS = -rdynamic -lm $(LDFLAGS) M32=-m32 - -CFLAGS = -c -O2 -pipe \ -- -falign-functions=32 -fomit-frame-pointer -fno-strict-aliasing \ +DYNAMIC-LIB-FLAGS = -shared -export-dynamic $(LDFLAGS) -lm -+CFLAGS += -c -pipe -fomit-frame-pointer -fno-strict-aliasing \ ++CFLAGS += -c -pipe \ + -falign-functions=32 -fomit-frame-pointer -fno-strict-aliasing \ -W -Wimplicit -Wreturn-type -Wunused -Wformat \ -Wuninitialized -Wstrict-prototypes \ - -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 @@ -46,10 +46,10 @@ diff -u -r ../picoLisp/src/Makefile ./src/Makefile - OS = FreeBSD - CC = gcc - CCLD = clang -- CFLAGS += ${M32} +- CFLAGS += ${M32} -fPIC - PICOLISP-FLAGS = ${M32} -rdynamic - LIB-FLAGS = -lm -- DYNAMIC-LIB-FLAGS = ${M32} -shared -export-dynamic +- DYNAMIC-LIB-FLAGS = ${M32} -shared - LCRYPT = -lcrypt - STRIP = strip -else