sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

picolisp: Update from 17.9.1 to 17.9.27

Browse Source
This commit is contained in:
Fredrik Fornwall 2017-09-27 12:15:01 +02:00
parent 4f3bb872fc
commit ca7345e044
2 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/picolisp/build.sh
View File

@ -1,8 +1,8 @@
TERMUX_PKG_HOMEPAGE=https://picolisp.com TERMUX_PKG_HOMEPAGE=https://picolisp.com
TERMUX_PKG_DESCRIPTION="Lisp interpreter and application server framework" TERMUX_PKG_DESCRIPTION="Lisp interpreter and application server framework"
TERMUX_PKG_DEPENDS="libcrypt, openssl" TERMUX_PKG_DEPENDS="libcrypt, openssl"
TERMUX_PKG_VERSION=17.9.1 TERMUX_PKG_VERSION=17.9.27
TERMUX_PKG_SHA256=e49e548c4346991755c6b7a4760b10929ed391cfa0049de0b81356b49a809900 TERMUX_PKG_SHA256=a94f65f99fd221323e6f89d0179a37e254fcbeb4bef4914ed4281cf52e362fa8
# We use our bintray mirror since old version snapshots are not kept on main site. # 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_SRCURL=https://dl.bintray.com/termux/upstream/picolisp_${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_BUILD_IN_SRC=true

50
packages/picolisp/src-Makefile.patch
View File

@ -1,7 +1,7 @@
diff -u -r ../picoLisp/src/Makefile ./src/Makefile diff -u -r ../picoLisp/src/Makefile ./src/Makefile
--- ../picoLisp/src/Makefile 2017-07-06 14:35:21.000000000 +0200 --- ../picoLisp/src/Makefile 2017-09-27 10:57:21.000000000 +0200
+++ ./src/Makefile 2017-07-10 01:13:20.897855727 +0200 +++ ./src/Makefile 2017-09-27 12:11:45.818006489 +0200
@@ -6,118 +6,14 @@ @@ -6,9 +6,7 @@
picoFiles = main.c gc.c apply.c flow.c sym.c subr.c big.c io.c net.c tab.c picoFiles = main.c gc.c apply.c flow.c sym.c subr.c big.c io.c net.c tab.c
@ -9,6 +9,12 @@ diff -u -r ../picoLisp/src/Makefile ./src/Makefile
# CCLD is the cc (compiler frontend) to use for the link step. # CCLD is the cc (compiler frontend) to use for the link step.
-CCLD = gcc -CCLD = gcc
ifeq ($(shell getconf LONG_BIT), 64)
M32=-m32
@@ -16,114 +14,11 @@
M32=
endif
-CFLAGS = -c -O2 -pipe \ -CFLAGS = -c -O2 -pipe \
- -falign-functions=32 -fomit-frame-pointer -fno-strict-aliasing \ - -falign-functions=32 -fomit-frame-pointer -fno-strict-aliasing \
- -W -Wimplicit -Wreturn-type -Wunused -Wformat \ - -W -Wimplicit -Wreturn-type -Wunused -Wformat \
@ -18,17 +24,17 @@ diff -u -r ../picoLisp/src/Makefile ./src/Makefile
- -
-ifeq ($(shell uname), Linux) -ifeq ($(shell uname), Linux)
- OS = Linux - OS = Linux
- CFLAGS += -m32 - CFLAGS += ${M32}
- PICOLISP-FLAGS = -m32 -rdynamic - PICOLISP-FLAGS = ${M32} -rdynamic
- LIB-FLAGS = -lm -ldl - LIB-FLAGS = -lm -ldl
- DYNAMIC-LIB-FLAGS = -m32 -shared -export-dynamic - DYNAMIC-LIB-FLAGS = ${M32} -shared -export-dynamic
- LCRYPT = -lcrypt - LCRYPT = -lcrypt
- STRIP = strip - STRIP = strip
-else -else
-ifeq ($(shell uname), OpenBSD) -ifeq ($(shell uname), OpenBSD)
- OS = OpenBSD - OS = OpenBSD
- CFLAGS += -m32 - CFLAGS += ${M32}
- PICOLISP-FLAGS = -m32 -rdynamic -Wl,-E - PICOLISP-FLAGS = ${M32} -rdynamic -Wl,-E
- LIB-FLAGS = -lm - LIB-FLAGS = -lm
- DYNAMIC-LIB-FLAGS = -Wl,-E -Wl,-shared - DYNAMIC-LIB-FLAGS = -Wl,-E -Wl,-shared
- LCRYPT = -lcrypto - LCRYPT = -lcrypto
@ -38,34 +44,34 @@ diff -u -r ../picoLisp/src/Makefile ./src/Makefile
- OS = FreeBSD - OS = FreeBSD
- CC = gcc - CC = gcc
- CCLD = clang - CCLD = clang
- CFLAGS += -m32 - CFLAGS += ${M32}
- PICOLISP-FLAGS = -m32 -rdynamic - PICOLISP-FLAGS = ${M32} -rdynamic
- LIB-FLAGS = -lm - LIB-FLAGS = -lm
- DYNAMIC-LIB-FLAGS = -m32 -shared -export-dynamic - DYNAMIC-LIB-FLAGS = ${M32} -shared -export-dynamic
- LCRYPT = -lcrypt - LCRYPT = -lcrypt
- STRIP = strip - STRIP = strip
-else -else
-ifeq ($(shell uname), NetBSD) -ifeq ($(shell uname), NetBSD)
- OS = NetBSD - OS = NetBSD
- CFLAGS += -m32 - CFLAGS += ${M32}
- PICOLISP-FLAGS = -m32 -rdynamic - PICOLISP-FLAGS = ${M32} -rdynamic
- LIB-FLAGS = -lm - LIB-FLAGS = -lm
- DYNAMIC-LIB-FLAGS = -m32 -shared -export-dynamic - DYNAMIC-LIB-FLAGS = ${M32} -shared -export-dynamic
- LCRYPT = -lcrypto - LCRYPT = -lcrypto
- STRIP = strip - STRIP = strip
-else -else
-ifeq ($(shell uname), Darwin) -ifeq ($(shell uname), Darwin)
- OS = Darwin - OS = Darwin
- CFLAGS += -m32 - CFLAGS += ${M32}
- PICOLISP-FLAGS = -m32 - PICOLISP-FLAGS = ${M32}
- LIB-FLAGS = -lc -lm -ldl - LIB-FLAGS = -lc -lm -ldl
- DYNAMIC-LIB-FLAGS = -m32 -dynamiclib -undefined dynamic_lookup - DYNAMIC-LIB-FLAGS = ${M32} -dynamiclib -undefined dynamic_lookup
- LCRYPT = -lcrypto - LCRYPT = -lcrypto
- STRIP = strip -x - STRIP = strip -x
-else -else
-ifeq ($(shell uname), SunOS) -ifeq ($(shell uname), SunOS)
- OS = SunOS - OS = SunOS
- CFLAGS += -m32 - CFLAGS += ${M32}
- PICOLISP-FLAGS = - PICOLISP-FLAGS =
- LIB-FLAGS = -lm -lnsl -lsocket - LIB-FLAGS = -lm -lnsl -lsocket
- DYNAMIC-LIB-FLAGS = -G - DYNAMIC-LIB-FLAGS = -G
@ -84,9 +90,9 @@ diff -u -r ../picoLisp/src/Makefile ./src/Makefile
-ifeq ($(shell uname), HP-UX) -ifeq ($(shell uname), HP-UX)
- OS = HP-UX - OS = HP-UX
- CFLAGS += - CFLAGS +=
- PICOLISP-FLAGS = -m32 -rdynamic - PICOLISP-FLAGS = ${M32} -rdynamic
- LIB-FLAGS = -lm -ldl - LIB-FLAGS = -lm -ldl
- DYNAMIC-LIB-FLAGS = -m32 -shared - DYNAMIC-LIB-FLAGS = ${M32} -shared
- LCRYPT = - LCRYPT =
- STRIP = strip - STRIP = strip
-else -else
@ -98,7 +104,7 @@ diff -u -r ../picoLisp/src/Makefile ./src/Makefile
-else -else
-ifeq ($(shell uname -o | egrep -q "Cygwin|Msys" ; echo $$?), 0) -ifeq ($(shell uname -o | egrep -q "Cygwin|Msys" ; echo $$?), 0)
- OS = Cygwin - OS = Cygwin
- CFLAGS += -m32 - CFLAGS += ${M32}
- DYNAMIC-LIB-FLAGS = -shared - DYNAMIC-LIB-FLAGS = -shared
- PICOLISP-FLAGS = - PICOLISP-FLAGS =
- DLL-DEFS = $(bin)/picolisp.dll - DLL-DEFS = $(bin)/picolisp.dll
@ -116,8 +122,8 @@ diff -u -r ../picoLisp/src/Makefile ./src/Makefile
-endif -endif
-endif -endif
-endif -endif
-
+CCLD = $(CC) +CCLD = $(CC)
+LCRYPT = -lcrypt +LCRYPT = -lcrypt
+OS = Android +OS = Android
+PICOLISP-FLAGS = -rdynamic -lm $(LDFLAGS) +PICOLISP-FLAGS = -rdynamic -lm $(LDFLAGS)