From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Wed, 27 Sep 2017 10:15:01 +0000 (+0200)
Subject: picolisp: Update from 17.9.1 to 17.9.27
X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/commitdiff_plain/6f6f0be2d85c7f1402b794f59ea6eba4f96f122d

picolisp: Update from 17.9.1 to 17.9.27
---

diff --git a/packages/picolisp/build.sh b/packages/picolisp/build.sh
index 79b46f52..2516aac4 100644
--- a/packages/picolisp/build.sh
+++ b/packages/picolisp/build.sh
@@ -1,8 +1,8 @@
 TERMUX_PKG_HOMEPAGE=https://picolisp.com
 TERMUX_PKG_DESCRIPTION="Lisp interpreter and application server framework"
 TERMUX_PKG_DEPENDS="libcrypt, openssl"
-TERMUX_PKG_VERSION=17.9.1
-TERMUX_PKG_SHA256=e49e548c4346991755c6b7a4760b10929ed391cfa0049de0b81356b49a809900
+TERMUX_PKG_VERSION=17.9.27
+TERMUX_PKG_SHA256=a94f65f99fd221323e6f89d0179a37e254fcbeb4bef4914ed4281cf52e362fa8
 # 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 0a3b40c9..a67049fd 100644
--- a/packages/picolisp/src-Makefile.patch
+++ b/packages/picolisp/src-Makefile.patch
@@ -1,7 +1,7 @@
 diff -u -r ../picoLisp/src/Makefile ./src/Makefile
---- ../picoLisp/src/Makefile	2017-07-06 14:35:21.000000000 +0200
-+++ ./src/Makefile	2017-07-10 01:13:20.897855727 +0200
-@@ -6,118 +6,14 @@
+--- ../picoLisp/src/Makefile	2017-09-27 10:57:21.000000000 +0200
++++ ./src/Makefile	2017-09-27 12:11:45.818006489 +0200
+@@ -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
  
@@ -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 = gcc
  
+ ifeq ($(shell getconf LONG_BIT), 64)
+   M32=-m32
+@@ -16,114 +14,11 @@
+   M32=
+ endif
+ 
 -CFLAGS = -c -O2 -pipe \
 -	-falign-functions=32 -fomit-frame-pointer -fno-strict-aliasing \
 -	-W -Wimplicit -Wreturn-type -Wunused -Wformat \
@@ -18,17 +24,17 @@ diff -u -r ../picoLisp/src/Makefile ./src/Makefile
 -
 -ifeq ($(shell uname), Linux)
 -	OS = Linux
--	CFLAGS += -m32
--	PICOLISP-FLAGS = -m32 -rdynamic
+-	CFLAGS += ${M32}
+-	PICOLISP-FLAGS = ${M32} -rdynamic
 -	LIB-FLAGS = -lm -ldl
--	DYNAMIC-LIB-FLAGS = -m32 -shared -export-dynamic
+-	DYNAMIC-LIB-FLAGS = ${M32} -shared -export-dynamic
 -	LCRYPT = -lcrypt
 -	STRIP = strip
 -else
 -ifeq ($(shell uname), OpenBSD)
 -	OS = OpenBSD
--	CFLAGS += -m32
--	PICOLISP-FLAGS = -m32 -rdynamic -Wl,-E
+-	CFLAGS += ${M32}
+-	PICOLISP-FLAGS = ${M32} -rdynamic -Wl,-E
 -	LIB-FLAGS = -lm
 -	DYNAMIC-LIB-FLAGS = -Wl,-E -Wl,-shared
 -	LCRYPT = -lcrypto
@@ -38,34 +44,34 @@ diff -u -r ../picoLisp/src/Makefile ./src/Makefile
 -	OS = FreeBSD
 -	CC = gcc
 -	CCLD = clang
--	CFLAGS += -m32
--	PICOLISP-FLAGS = -m32 -rdynamic
+-	CFLAGS += ${M32}
+-	PICOLISP-FLAGS = ${M32} -rdynamic
 -	LIB-FLAGS = -lm
--	DYNAMIC-LIB-FLAGS = -m32 -shared -export-dynamic
+-	DYNAMIC-LIB-FLAGS = ${M32} -shared -export-dynamic
 -	LCRYPT = -lcrypt
 -	STRIP = strip
 -else
 -ifeq ($(shell uname), NetBSD)
 -	OS = NetBSD
--	CFLAGS += -m32
--	PICOLISP-FLAGS = -m32 -rdynamic
+-	CFLAGS += ${M32}
+-	PICOLISP-FLAGS = ${M32} -rdynamic
 -	LIB-FLAGS = -lm
--	DYNAMIC-LIB-FLAGS = -m32 -shared -export-dynamic
+-	DYNAMIC-LIB-FLAGS = ${M32} -shared -export-dynamic
 -	LCRYPT = -lcrypto
 -	STRIP = strip
 -else
 -ifeq ($(shell uname), Darwin)
 -	OS = Darwin
--	CFLAGS += -m32
--	PICOLISP-FLAGS = -m32
+-	CFLAGS += ${M32}
+-	PICOLISP-FLAGS = ${M32}
 -	LIB-FLAGS = -lc -lm -ldl
--	DYNAMIC-LIB-FLAGS = -m32 -dynamiclib -undefined dynamic_lookup
+-	DYNAMIC-LIB-FLAGS = ${M32} -dynamiclib -undefined dynamic_lookup
 -	LCRYPT = -lcrypto
 -	STRIP = strip -x
 -else
 -ifeq ($(shell uname), SunOS)
 -	OS = SunOS
--	CFLAGS += -m32
+-	CFLAGS += ${M32}
 -	PICOLISP-FLAGS =
 -	LIB-FLAGS = -lm -lnsl -lsocket
 -	DYNAMIC-LIB-FLAGS = -G
@@ -84,9 +90,9 @@ diff -u -r ../picoLisp/src/Makefile ./src/Makefile
 -ifeq ($(shell uname), HP-UX)
 -	OS = HP-UX
 -	CFLAGS +=
--	PICOLISP-FLAGS = -m32 -rdynamic
+-	PICOLISP-FLAGS = ${M32} -rdynamic
 -	LIB-FLAGS = -lm -ldl
--	DYNAMIC-LIB-FLAGS = -m32 -shared
+-	DYNAMIC-LIB-FLAGS = ${M32} -shared
 -	LCRYPT =
 -	STRIP = strip
 -else
@@ -98,7 +104,7 @@ diff -u -r ../picoLisp/src/Makefile ./src/Makefile
 -else
 -ifeq ($(shell uname -o | egrep -q "Cygwin|Msys" ; echo $$?), 0)
 -	OS = Cygwin
--	CFLAGS += -m32
+-	CFLAGS += ${M32}
 -	DYNAMIC-LIB-FLAGS = -shared
 -	PICOLISP-FLAGS =
 -	DLL-DEFS = $(bin)/picolisp.dll
@@ -116,8 +122,8 @@ diff -u -r ../picoLisp/src/Makefile ./src/Makefile
 -endif
 -endif
 -endif
+-
 +CCLD = $(CC)
- 
 +LCRYPT = -lcrypt
 +OS = Android
 +PICOLISP-FLAGS = -rdynamic -lm $(LDFLAGS)