From de4a8ecd82c293d7471fc6ffcdb27817afd02bf5 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 21 Mar 2013 01:17:43 +0100 Subject: [PATCH] newlisp: only build with NEWLISP64 on 64bit archs; create bin symlink. --- srcpkgs/newlisp/patches/build-fixes.patch | 2 +- srcpkgs/newlisp/template | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/srcpkgs/newlisp/patches/build-fixes.patch b/srcpkgs/newlisp/patches/build-fixes.patch index d6de7544d1a..3d85c8c7096 100644 --- a/srcpkgs/newlisp/patches/build-fixes.patch +++ b/srcpkgs/newlisp/patches/build-fixes.patch @@ -5,7 +5,7 @@ nl-sock.o nl-import.o nl-xml.o nl-web.o nl-matrix.o nl-debug.o nl-utf8.o pcre.o -CFLAGS = -fPIC -m64 -Wall -pedantic -Wno-uninitialized -Wno-strict-aliasing -Wno-long-long -c -O2 -g -DREADLINE -DSUPPORT_UTF8 -DNEWLISP64 -DLINUX -DFFI -I/usr/lib/x86_64-linux-gnu -+CFLAGS += -fPIC -Wall -pedantic -Wno-uninitialized -Wno-strict-aliasing -Wno-long-long -c -DREADLINE -DSUPPORT_UTF8 -DNEWLISP64 -DLINUX -DFFI ++CFLAGS += -fPIC -Wall -pedantic -Wno-uninitialized -Wno-strict-aliasing -Wno-long-long -c -DREADLINE -DSUPPORT_UTF8 -DLINUX -DFFI -CC = gcc +CC ?= gcc diff --git a/srcpkgs/newlisp/template b/srcpkgs/newlisp/template index 6b5c0eaeeb5..78f20ce077b 100644 --- a/srcpkgs/newlisp/template +++ b/srcpkgs/newlisp/template @@ -1,7 +1,7 @@ # Template file for 'newlisp' pkgname=newlisp version=10.4.5 -revision=1 +revision=2 makedepends="which readline-devel libffi-devel" crossmakedepends="readline-devel libffi-devel" short_desc="Lisp-like, general-purpose scripting language" @@ -19,6 +19,9 @@ long_desc=" support for distributed and parallel processing, and Bayesian statistics." do_build() { + if [ "$XBPS_MACHINE" = "x86_64" ]; then + export CFLAGS="$CFLAGS -DNEWLISP64" + fi make -f makefile_linuxLP64_utf8_ffi ${makejobs} } @@ -29,4 +32,7 @@ do_install() { mandir=$DESTDIR/usr/share/man install vmove usr/share/doc/$pkgname/COPYING \ usr/share/licenses/$pkgname + + # Create newlisp symlink; + ln -sfr ${DESTDIR}/usr/bin/newlisp-${version} ${DESTDIR}/usr/bin/newlisp }