X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/b10c297cd4a796a2a551b19ad08fd5c3fdddf302..6f6f0be2d85c7f1402b794f59ea6eba4f96f122d:/packages/picolisp/src-Makefile.patch

diff --git a/packages/picolisp/src-Makefile.patch b/packages/picolisp/src-Makefile.patch
index ac3a148f..a67049fd 100644
--- a/packages/picolisp/src-Makefile.patch
+++ b/packages/picolisp/src-Makefile.patch
@@ -1,14 +1,20 @@
 diff -u -r ../picoLisp/src/Makefile ./src/Makefile
---- ../picoLisp/src/Makefile	2015-03-31 14:48:22.000000000 -0400
-+++ ./src/Makefile	2015-09-24 05:23:56.372236679 -0400
-@@ -6,111 +6,13 @@
+--- ../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
  
 -CC = gcc
  # 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,15 +90,21 @@ 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
--ifeq ($(shell uname -o), Cygwin)
+-ifeq ($(shell uname), IRIX64)
+-    OS = IRIX64
+-    CFLAGS += -std=gnu99
+-    DYNAMIC-LIB-FLAGS = -shared
+-    STRIP = strip -f
+-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
@@ -109,12 +121,13 @@ diff -u -r ../picoLisp/src/Makefile ./src/Makefile
 -endif
 -endif
 -endif
+-endif
+-
 +CCLD = $(CC)
- 
-+LCRYPT = 
++LCRYPT = -lcrypt
 +OS = Android
 +PICOLISP-FLAGS = -rdynamic -lm $(LDFLAGS)
-+DYNAMIC-LIB-FLAGS = -shared -export-dynamic $(LDFLAGS)
++DYNAMIC-LIB-FLAGS = -shared -export-dynamic $(LDFLAGS) -lm
  
  picolisp: $(bin)/picolisp $(lib)/ext$(dll) $(lib)/ht$(dll)
  tools: $(bin)/lat1 $(bin)/utf2 $(bin)/balance