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

picolisp: Update from 17.9.27 to 17.10.28

Browse Source
This commit is contained in:
Fredrik Fornwall 2017-10-28 23:54:11 +02:00
parent a52f6f22da
commit 54817ebb53
2 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/picolisp/build.sh
View File

@ -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.27
TERMUX_PKG_SHA256=a94f65f99fd221323e6f89d0179a37e254fcbeb4bef4914ed4281cf52e362fa8
TERMUX_PKG_VERSION=17.10.28
TERMUX_PKG_SHA256=22e22121405c35d22c719e2590c469bd9e34e6899c4e3eccf28e4f5b08583227
# 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
@ -22,9 +22,7 @@ termux_step_pre_configure() {
if [ $TERMUX_ARCH_BITS = 64 ]; then
cd $TERMUX_PKG_SRCDIR
if [ $TERMUX_ARCH = "aarch64" ]; then
export TERMUX_PKG_EXTRA_MAKE_ARGS=arm64.linux
elif [ $TERMUX_ARCH = "x86_64" ]; then
export TERMUX_PKG_EXTRA_MAKE_ARGS=x86-64.linux
export TERMUX_PKG_EXTRA_MAKE_ARGS=arm64.android
else
termux_error_exit "Unsupported arch: $TERMUX_ARCH"
fi

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

@ -1,7 +1,7 @@
diff -u -r ../picoLisp/src/Makefile ./src/Makefile
--- ../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 @@
--- ../picoLisp/src/Makefile 2017-10-04 09:22:44.000000000 +0200
+++ ./src/Makefile 2017-10-28 23:38:13.679734200 +0200
@@ -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
@ -9,18 +9,20 @@ 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
+CCLD = $(CC)
+LCRYPT = -lcrypt
+PICOLISP-FLAGS = -rdynamic -lm $(LDFLAGS)
M32=-m32
-
-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
-
-DYNAMIC-CC-FLAGS=
-
-ifeq ($(shell uname), Linux)
- OS = Linux
@ -97,10 +99,10 @@ diff -u -r ../picoLisp/src/Makefile ./src/Makefile
- STRIP = strip
-else
-ifeq ($(shell uname), IRIX64)
- OS = IRIX64
- CFLAGS += -std=gnu99
- DYNAMIC-LIB-FLAGS = -shared
- STRIP = strip -f
- 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
@ -123,11 +125,7 @@ diff -u -r ../picoLisp/src/Makefile ./src/Makefile
-endif
-endif
-
+CCLD = $(CC)
+LCRYPT = -lcrypt
+OS = Android
+PICOLISP-FLAGS = -rdynamic -lm $(LDFLAGS)
+DYNAMIC-LIB-FLAGS = -shared -export-dynamic $(LDFLAGS) -lm
+ -D_GNU_SOURCE
picolisp: $(bin)/picolisp $(lib)/ext$(dll) $(lib)/ht$(dll)
tools: $(bin)/lat1 $(bin)/utf2 $(bin)/balance