~mdw
/
termux-packages
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
php: Update from 7.1.11 to 7.1.12
[termux-packages]
/
packages
/
picolisp
/
src-Makefile.patch
diff --git
a/packages/picolisp/src-Makefile.patch
b/packages/picolisp/src-Makefile.patch
index
ac3a148
..
b5a7f7a
100644
(file)
--- a/
packages/picolisp/src-Makefile.patch
+++ b/
packages/picolisp/src-Makefile.patch
@@
-1,34
+1,42
@@
diff -u -r ../picoLisp/src/Makefile ./src/Makefile
diff -u -r ../picoLisp/src/Makefile ./src/Makefile
---- ../picoLisp/src/Makefile 201
5-03-31 14:48:22.000000000 -04
00
-+++ ./src/Makefile 201
5-09-24 05:23:56.372236679 -04
00
-@@ -6,1
11 +6,13
@@
+--- ../picoLisp/src/Makefile 201
7-10-04 09:22:44.000000000 +02
00
++++ ./src/Makefile 201
7-10-28 23:38:13.679734200 +02
00
+@@ -6,1
21 +6,17
@@
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
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
+
++CCLD = $(CC)
++LCRYPT = -lcrypt
++PICOLISP-FLAGS = -rdynamic -lm $(LDFLAGS)
+ M32=-m32
-
-CFLAGS = -c -O2 -pipe \
- -falign-functions=32 -fomit-frame-pointer -fno-strict-aliasing \
-
-CFLAGS = -c -O2 -pipe \
- -falign-functions=32 -fomit-frame-pointer -fno-strict-aliasing \
-- -W -Wimplicit -Wreturn-type -Wunused -Wformat \
-- -Wuninitialized -Wstrict-prototypes \
++DYNAMIC-LIB-FLAGS = -shared -export-dynamic $(LDFLAGS) -lm
++CFLAGS += -c -pipe -fomit-frame-pointer -fno-strict-aliasing \
+ -W -Wimplicit -Wreturn-type -Wunused -Wformat \
+ -Wuninitialized -Wstrict-prototypes \
- -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
-
- -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
-
+-DYNAMIC-CC-FLAGS=
-
-ifeq ($(shell uname), Linux)
- OS = Linux
-
-ifeq ($(shell uname), Linux)
- OS = Linux
-- CFLAGS +=
-m32
-- PICOLISP-FLAGS =
-m32
-rdynamic
+- CFLAGS +=
${M32}
+- 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
- STRIP = strip
-else
-ifeq ($(shell uname), OpenBSD)
- OS = OpenBSD
- 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
- LIB-FLAGS = -lm
- DYNAMIC-LIB-FLAGS = -Wl,-E -Wl,-shared
- LCRYPT = -lcrypto
@@
-38,34
+46,34
@@
diff -u -r ../picoLisp/src/Makefile ./src/Makefile
- OS = FreeBSD
- CC = gcc
- CCLD = clang
- OS = FreeBSD
- CC = gcc
- CCLD = clang
-- CFLAGS +=
-m32
-- PICOLISP-FLAGS =
-m32
-rdynamic
+- CFLAGS +=
${M32}
+- 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
- STRIP = strip
-else
-ifeq ($(shell uname), NetBSD)
- OS = NetBSD
- 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
- 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
- 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
- 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
- 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
- PICOLISP-FLAGS =
- LIB-FLAGS = -lm -lnsl -lsocket
- DYNAMIC-LIB-FLAGS = -G
@@
-84,15
+92,21
@@
diff -u -r ../picoLisp/src/Makefile ./src/Makefile
-ifeq ($(shell uname), HP-UX)
- OS = HP-UX
- CFLAGS +=
-ifeq ($(shell uname), HP-UX)
- OS = HP-UX
- 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 =
- STRIP = strip
-else
- 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
- OS = Cygwin
-- CFLAGS +=
-m32
+- CFLAGS +=
${M32}
- DYNAMIC-LIB-FLAGS = -shared
- PICOLISP-FLAGS =
- DLL-DEFS = $(bin)/picolisp.dll
- DYNAMIC-LIB-FLAGS = -shared
- PICOLISP-FLAGS =
- DLL-DEFS = $(bin)/picolisp.dll
@@
-109,12
+123,9
@@
diff -u -r ../picoLisp/src/Makefile ./src/Makefile
-endif
-endif
-endif
-endif
-endif
-endif
-+CCLD = $(CC)
-
-+LCRYPT =
-+OS = Android
-+PICOLISP-FLAGS = -rdynamic -lm $(LDFLAGS)
-+DYNAMIC-LIB-FLAGS = -shared -export-dynamic $(LDFLAGS)
+-endif
+-
++ -D_GNU_SOURCE
picolisp: $(bin)/picolisp $(lib)/ext$(dll) $(lib)/ht$(dll)
tools: $(bin)/lat1 $(bin)/utf2 $(bin)/balance
picolisp: $(bin)/picolisp $(lib)/ext$(dll) $(lib)/ht$(dll)
tools: $(bin)/lat1 $(bin)/utf2 $(bin)/balance