From 6c84161edf48293b8799c7186ec9fa57a8cec36f Mon Sep 17 00:00:00 2001 From: mjl Date: Sat, 17 Apr 1999 01:55:55 +0000 Subject: Make this work with egcs using the compilation notes provided by Sean Doran . Closes PR/6339. --- lang/clisp/Makefile | 12 ++++-------- lang/clisp/files/md5 | 4 ++-- lang/clisp/patches/patch-aa | 4 ++-- lang/clisp/patches/patch-ac | 16 ++++++++++++++++ lang/clisp/patches/patch-ad | 16 ++++++++++++++++ lang/clisp/patches/patch-ae | 21 +++++++++++++++++++++ 6 files changed, 61 insertions(+), 12 deletions(-) create mode 100644 lang/clisp/patches/patch-ac create mode 100644 lang/clisp/patches/patch-ad create mode 100644 lang/clisp/patches/patch-ae (limited to 'lang/clisp') diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile index 7bd9d1781f8..49e2824ac0d 100644 --- a/lang/clisp/Makefile +++ b/lang/clisp/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.7 1999/02/20 22:48:32 hubertf Exp $ +# $NetBSD: Makefile,v 1.8 1999/04/17 01:55:55 mjl Exp $ -DISTNAME= clispsrc-19990108 +DISTNAME= clispsrc PKGNAME= clisp-19990108 CATEGORIES= lang -MASTER_SITES= ${MASTER_SITE_LOCAL} +MASTER_SITES= ftp://ftp2.cons.org/pub/lisp/clisp/source/ \ + ftp://ftp.tu-darmstadt.de/pub/programming/languages/lisp/clisp/source/ MAINTAINER= mjl@emsi.priv.at HOMEPAGE= http://clisp.cons.org/~haible/clisp.html @@ -12,11 +13,6 @@ NOT_FOR_ARCHS= alpha # severe LP64 problems MIRROR_DISTFILE= no -GCC_VERSION!= gcc --version -.if (${GCC_VERSION:C/-.*$$//} == egcs) && !target(clean) -IGNORE= "cannot be built with egcs yet" -.endif - GNU_CONFIGURE= YES WRKSRC= ${WRKDIR}/clisp-1999-01-08/src diff --git a/lang/clisp/files/md5 b/lang/clisp/files/md5 index 36b979b6051..f3244f8533a 100644 --- a/lang/clisp/files/md5 +++ b/lang/clisp/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.3 1999/01/31 23:37:28 tron Exp $ +$NetBSD: md5,v 1.4 1999/04/17 01:55:55 mjl Exp $ -MD5 (clispsrc-19990108.tar.gz) = 2faa2d691742f2ab4d259c51fe1afaf5 +MD5 (clispsrc.tar.gz) = 2faa2d691742f2ab4d259c51fe1afaf5 diff --git a/lang/clisp/patches/patch-aa b/lang/clisp/patches/patch-aa index d158d84aa06..6bb0ff243d5 100644 --- a/lang/clisp/patches/patch-aa +++ b/lang/clisp/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 1998/11/22 19:39:48 tron Exp $ +$NetBSD: patch-aa,v 1.4 1999/04/17 01:55:55 mjl Exp $ --- makemake.in.orig Sun Aug 9 21:27:13 1998 +++ makemake.in Sun Sep 6 21:55:57 1998 @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.3 1998/11/22 19:39:48 tron Exp $ esac fi +if [ "$TSYSOS" = "netbsd" ] ; then # NetBSD -+ XCFLAGS=$XCFLAGS' -DNO_GENERATIONAL_GC' ++ XCFLAGS=$XCFLAGS' -DNO_GENERATIONAL_GC -fpcc-struct-return -Dunix' +fi if [ $TSYS = sun4 -a $CROSS = false ] ; then diff --git a/lang/clisp/patches/patch-ac b/lang/clisp/patches/patch-ac new file mode 100644 index 00000000000..b09b009be65 --- /dev/null +++ b/lang/clisp/patches/patch-ac @@ -0,0 +1,16 @@ +$NetBSD: patch-ac,v 1.1 1999/04/17 01:55:55 mjl Exp $ + +--- ../ffcall/avcall/Makefile.in.orig Sat Apr 17 02:28:04 1999 ++++ ../ffcall/avcall/Makefile.in Sat Apr 17 02:38:43 1999 +@@ -130,10 +130,7 @@ + tests : tests.o $(OBJECTS) + $(CC) $(CFLAGS) tests.o $(OBJECTS) -o tests + +-check : all tests +- ./tests > tests.out +- uniq -u < tests.out > tests.output.$(HOST) +- test '!' -s tests.output.$(HOST) ++check : # This test crashes with egcs + + mostlyclean : clean + diff --git a/lang/clisp/patches/patch-ad b/lang/clisp/patches/patch-ad new file mode 100644 index 00000000000..4c58e9b98df --- /dev/null +++ b/lang/clisp/patches/patch-ad @@ -0,0 +1,16 @@ +$NetBSD: patch-ad,v 1.1 1999/04/17 01:55:55 mjl Exp $ + +--- ../ffcall/callback/Makefile.in.orig Sat Apr 17 02:34:45 1999 ++++ ../ffcall/callback/Makefile.in Sat Apr 17 02:35:02 1999 +@@ -99,10 +99,7 @@ + check-subdirs : force + cd @subdir@; $(MAKE) check + +-check : all check-subdirs tests +- ./tests > tests.out +- uniq -u < tests.out > tests.output.$(HOST) +- test '!' -s tests.output.$(HOST) ++check : # Theses tests also fail with egcs. + + mostlyclean : force + cd @subdir@; $(MAKE) mostlyclean diff --git a/lang/clisp/patches/patch-ae b/lang/clisp/patches/patch-ae new file mode 100644 index 00000000000..9546d767ce8 --- /dev/null +++ b/lang/clisp/patches/patch-ae @@ -0,0 +1,21 @@ +$NetBSD: patch-ae,v 1.1 1999/04/17 01:55:56 mjl Exp $ + +*** unix.d.orig Sat Apr 17 02:51:01 1999 +--- unix.d Sat Apr 17 02:51:12 1999 +*************** +*** 29,35 **** + # geschützt sein. + #define OS_errno errno + extern int sys_nerr; # Anzahl der Betriebssystem-Fehlermeldungen +! extern SYS_ERRLIST_CONST char* SYS_ERRLIST_CONST sys_errlist[]; # Betriebssystem-Fehlermeldungen + # siehe PERROR(3) + # wird verwendet von ERROR, SPVW, STREAM, PATHNAME + +--- 29,35 ---- + # geschützt sein. + #define OS_errno errno + extern int sys_nerr; # Anzahl der Betriebssystem-Fehlermeldungen +! # extern SYS_ERRLIST_CONST char* SYS_ERRLIST_CONST sys_errlist[]; # Betriebssystem-Fehlermeldungen + # siehe PERROR(3) + # wird verwendet von ERROR, SPVW, STREAM, PATHNAME + -- cgit v1.2.3