From 1e66755147027853867bd1c21336605ed0eae96c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 10 Apr 2016 20:31:34 +0200 Subject: [PATCH] newlisp: update to 10.7.0. --- srcpkgs/newlisp/patches/build-fixes.patch | 26 +++++++++++++++++------ srcpkgs/newlisp/template | 11 +++++----- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/srcpkgs/newlisp/patches/build-fixes.patch b/srcpkgs/newlisp/patches/build-fixes.patch index 6ca5273c0f1..17a8e34c587 100644 --- a/srcpkgs/newlisp/patches/build-fixes.patch +++ b/srcpkgs/newlisp/patches/build-fixes.patch @@ -1,22 +1,36 @@ ---- makefile_linuxLP64_utf8_ffi.orig 2014-06-06 07:35:14.274686902 +0200 -+++ makefile_linuxLP64_utf8_ffi 2014-06-06 07:39:18.871490802 +0200 -@@ -6,16 +6,15 @@ +--- makefile_linuxLP64_utf8_ffi.orig 2016-04-10 20:27:16.244225061 +0200 ++++ makefile_linuxLP64_utf8_ffi 2016-04-10 20:27:57.323104312 +0200 +@@ -6,19 +6,19 @@ OBJS = newlisp.o nl-symbol.o nl-math.o nl-list.o nl-liststr.o nl-string.o nl-filesys.o \ nl-sock.o nl-import.o nl-xml-json.o nl-web.o nl-matrix.o nl-debug.o nl-utf8.o pcre.o -CFLAGS = -fPIC -m64 -Wall -Wno-uninitialized -Wno-strict-aliasing -Wno-long-long -c -O2 -g -DREADLINE -DSUPPORT_UTF8 -DNEWLISP64 -DLINUX -DFFI -I/usr/local/lib/libffi-3.0.13/include -+CFLAGS += -fPIC -Wall -Wno-uninitialized -Wno-strict-aliasing -Wno-long-long -c -DREADLINE -DSUPPORT_UTF8 -DNEWLISP64 -DLINUX -DFFI ++CFLAGS += -fPIC -Wall -Wno-uninitialized -Wno-strict-aliasing -Wno-long-long -c -g -DREADLINE -DSUPPORT_UTF8 -DNEWLISP64 -DLINUX -DFFI + + # replace -O2 with -Oz when using clang/llvm + #CC = clang -CC = gcc +CC ?= gcc default: $(OBJS) -- $(CC) $(OBJS) -m64 -g -lm -ldl -lreadline -lffi -o newlisp # for UBUNTU Debian -+ $(CC) $(OBJS) -lm -ldl -lreadline -lffi -o newlisp # for UBUNTU Debian + $(CC) $(OBJS) -m64 -g -lm -ldl -lreadline -lffi -o newlisp # for UBUNTU Debian # $(CC) $(OBJS) -m64 -g -lm -ldl -lreadline -ltermcap -o newlisp # slackware # $(CC) $(OBJS) -m64 -g -lm -ldl -lreadline -lncurses -o newlisp # other Linux Dist # $(CC) $(OBJS) -m64 -g -lm -ldl -o newlisp # without readline support - strip newlisp ++# strip newlisp .c.o: $(CC) $(CFLAGS) $< +--- makefile_linuxLP64_utf8_ffi.orig 2016-04-10 20:30:01.588730930 +0200 ++++ makefile_linuxLP64_utf8_ffi 2016-04-10 20:30:33.211641988 +0200 +@@ -14,7 +14,7 @@ CFLAGS += -fPIC -Wall -Wno-uninitialized + CC ?= gcc + + default: $(OBJS) +- $(CC) $(OBJS) -m64 -g -lm -ldl -lreadline -lffi -o newlisp # for UBUNTU Debian ++ $(CC) $(OBJS) $(LDFLAGS) -lm -ldl -lreadline -lffi -o newlisp # for UBUNTU Debian + # $(CC) $(OBJS) -m64 -g -lm -ldl -lreadline -ltermcap -o newlisp # slackware + # $(CC) $(OBJS) -m64 -g -lm -ldl -lreadline -lncurses -o newlisp # other Linux Dist + # $(CC) $(OBJS) -m64 -g -lm -ldl -o newlisp # without readline support diff --git a/srcpkgs/newlisp/template b/srcpkgs/newlisp/template index 31b84a4f74c..87db1bf078d 100644 --- a/srcpkgs/newlisp/template +++ b/srcpkgs/newlisp/template @@ -1,6 +1,6 @@ # Template file for 'newlisp' pkgname=newlisp -version=10.6.2 +version=10.7.0 revision=1 makedepends="readline-devel libffi-devel" short_desc="Lisp-like, general-purpose scripting language" @@ -8,12 +8,13 @@ maintainer="Juan RP " license="GPL-3, zlib, $pkgname" homepage="http://www.newlisp.org" distfiles="$homepage/downloads/$pkgname-$version.tgz" -checksum=ae3ab77987cb2cfef4e986104be5be5ac9469317e9d74884c3ea89c2e4bb4040 +checksum=c4963bf32d67eef7e4957f7118632a0c40350fd0e28064bce095865b383137bb do_build() { - if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then - export CFLAGS+=" -DNEWLISP64" - fi + case "$XBPS_TARGET_MACHINE" in + x86_64*) export CFLAGS+=" -DNEWLISP64";; + esac + make -f makefile_linuxLP64_utf8_ffi ${makejobs} } do_install() {