Date: Wed, 4 Jun 2003 11:42:57 +0200 (CEST) From: Volker Stolz <stolz@i2.informatik.rwth-aachen.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: obraun@FreeBSD.org Subject: ports/52922: [patch] lang/wamcc: 2.22 -> 2.23 Message-ID: <200306040942.h549gvID041766@menelaos.informatik.rwth-aachen.de> Resent-Message-ID: <200306040950.h549oDxd063165@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 52922 >Category: ports >Synopsis: [patch] lang/wamcc: 2.22 -> 2.23 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Jun 04 02:50:12 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Volker Stolz >Release: FreeBSD 4.8-STABLE i386 >Organization: Lehrstuhl für Informatik II >Environment: System: FreeBSD menelaos.informatik.rwth-aachen.de 4.8-STABLE FreeBSD 4.8-STABLE #4: Tue Apr 29 11:28:13 CEST 2003 root@menelaos.informatik.rwth-aachen.de:/usr/obj/usr/src/sys/MENELAOS i386 >Description: Bento fix, no longer broken: - Update to "latest" version 2.23 which has been around for ages - Find out that it only generates working code with GCC 2.x >How-To-Repeat: http://bento.freebsd.org/errorlogs/i386-4-latest/wamcc-2.22.log >Fix: - Removed patch-ad diff -urN wamcc.orig/Makefile wamcc/Makefile --- wamcc.orig/Makefile Mon May 12 15:08:15 2003 +++ wamcc/Makefile Wed Jun 4 11:28:10 2003 @@ -6,17 +6,19 @@ # PORTNAME= wamcc -PORTVERSION= 2.22 +PORTVERSION= 2.23 CATEGORIES= lang MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/contraintes/wamcc/ -DISTFILES= wamcc2.22.tar.Z prg.tar.Z +DISTFILES= wamcc2.23.tar.gz prg.tar.Z MAINTAINER= ports@FreeBSD.Org COMMENT= Prolog-to-C translator from Inria -BROKEN= "Does not compile" - DIST_SUBDIR= wamcc NO_WRKSUBDIR= yes + +USE_GCC= 2.95 # compiled .pl files dump core w/ gcc 3.x + +PLIST_SUB= CC=${CC} .include <bsd.port.mk> diff -urN wamcc.orig/distinfo wamcc/distinfo --- wamcc.orig/distinfo Mon Nov 1 04:46:48 1999 +++ wamcc/distinfo Wed Jun 4 10:47:31 2003 @@ -1,2 +1,2 @@ -MD5 (wamcc/wamcc2.22.tar.Z) = dadc24bdee8a3167b4cffa32a936c00b +MD5 (wamcc/wamcc2.23.tar.gz) = a766e39759be33ba462ac2b43f394c98 MD5 (wamcc/prg.tar.Z) = fc9bee37ab3449535a5fb83c601e2da1 diff -urN wamcc.orig/files/patch-aa wamcc/files/patch-aa --- wamcc.orig/files/patch-aa Mon Nov 1 04:46:48 1999 +++ wamcc/files/patch-aa Wed Jun 4 11:01:53 2003 @@ -1,6 +1,6 @@ ---- Makefile.orig Tue Mar 7 03:21:05 1995 -+++ Makefile Sun Oct 31 13:03:29 1999 -@@ -5,12 +5,16 @@ +--- Makefile.orig Tue Mar 7 10:21:05 1995 ++++ Makefile Wed Jun 4 11:00:59 2003 +@@ -5,16 +5,20 @@ # /* Makefile */ # /*-----------------------------------------------------------------------*/ @@ -21,6 +21,11 @@ -BINPATH = $(ROOTPATH)/bin # you can specify the name of the C compiler + +-CC = gcc ++CC ?= gcc + + # do not change anything else @@ -25,24 +29,28 @@ diff -urN wamcc.orig/files/patch-ac wamcc/files/patch-ac --- wamcc.orig/files/patch-ac Sat Mar 31 13:09:02 2001 +++ wamcc/files/patch-ac Wed Jun 4 11:04:18 2003 @@ -1,31 +1,67 @@ ---- src/Makefile.orig Wed Jan 29 03:37:54 1997 -+++ src/Makefile Sat Mar 31 03:01:06 2001 -@@ -19 +19 @@ +--- src/Makefile.orig Wed Jan 29 12:37:54 1997 ++++ src/Makefile Wed Jun 4 11:02:44 2003 +@@ -10,13 +10,13 @@ + COMPILER = wamcc + INCPATH = `pwd` + LIBPATH = `pwd` +-CC = gcc ++CC ?= gcc + WCC = w_$(CC) + + + # other local variables + -CFLAGS = -O2 +#CFLAGS = -O2 -@@ -52 +52 @@ + CFLAGINLIN= -finline-functions + LFLAGS = + BMF = bmf_$(COMPILER) +@@ -49,22 +49,22 @@ + + + machine.o: machine.h archi.h wam_engine.h machine.c - $(WCC) $(CFLAGS) -c machine.c + ./$(WCC) $(CFLAGS) -c machine.c -@@ -55 +55 @@ + + wam_engine.o: machine.h archi.h wam_engine.h atom_pred.h wam_engine.c - $(WCC) $(CFLAGS) -c wam_engine.c + ./$(WCC) $(CFLAGS) -c wam_engine.c -@@ -58 +58 @@ + + wam_engine_pp.o: machine.h archi.h wam_engine.h atom_pred.h wam_engine.c - $(WCC) $(CFLAGS) -DWAM_PROFILE -c -o wam_engine_pp.o wam_engine.c + ./$(WCC) $(CFLAGS) -DWAM_PROFILE -c -o wam_engine_pp.o wam_engine.c -@@ -61 +61 @@ + + atom_pred.o: machine.h archi.h wam_engine.h atom_pred.h atom_pred.c - $(WCC) $(CFLAGS) -c atom_pred.c + ./$(WCC) $(CFLAGS) -c atom_pred.c -@@ -64 +64 @@ + + debugger.o: machine.h archi.h wam_engine.h atom_pred.h debugger.c - $(WCC) $(CFLAGS) -c debugger.c + ./$(WCC) $(CFLAGS) -c debugger.c -@@ -67 +67 @@ + + hash.o: machine.h hash.c - $(WCC) $(CFLAGS) -c hash.c + ./$(WCC) $(CFLAGS) -c hash.c -@@ -82 +82 @@ + + + +@@ -79,7 +79,7 @@ + + + $(WCC): configure archi.def - configure + ./configure -@@ -98,2 +98,2 @@ + chmod a+x $(WCC) + + $(BMF): bmf.c +@@ -95,8 +95,8 @@ + $(CC) $(CFLAGS) $(LFLAGS) -o pl2hex pl2hex.c + + $(COMPILER): - $(WCC) $(CFLAGS) -c wamcc*.c - $(WCC) $(CFLAGS) $(LFLAGS) -s -o $(COMPILER) wamcc*.o -l$(COMPILER) + ./$(WCC) $(CFLAGS) -c wamcc*.c + ./$(WCC) $(CFLAGS) $(LFLAGS) -s -o $(COMPILER) wamcc*.o -l$(COMPILER) + + + diff -urN wamcc.orig/files/patch-ad wamcc/files/patch-ad --- wamcc.orig/files/patch-ad Mon Nov 1 04:46:48 1999 +++ wamcc/files/patch-ad Thu Jan 1 01:00:00 1970 @@ -1,36 +0,0 @@ ---- src/debugger.c.orig Sun Dec 18 12:15:55 1994 -+++ src/debugger.c Tue Sep 14 04:16:44 1999 -@@ -278,7 +278,15 @@ - - #define Y_Storing_Invoc_Nb(e) (Y(e,3)) /* see call.pl */ - -+static void mygets(char *str, int size) -+{ -+ char *p; -+ fgets(str,size,stdin); - -+ p = index(str, '\n'); -+ if(p) -+ *p = '\0'; -+} - - - -@@ -959,7 +967,7 @@ - Lib1(printf," ? "); - - *str='\0'; -- Lib1(gets,str); -+ Lib2(mygets,str,sizeof(str) - 1); - if (*str=='\0') - Lib2(strcpy,str,"creep"); - -@@ -2047,7 +2055,7 @@ - Lib1(printf,"\nNew value: "); - - *str='\0'; -- Lib1(gets,str); -+ Lib2(mygets,str,sizeof(str) - 1); - if (*str=='\0') - return; - diff -urN wamcc.orig/files/patch-ae wamcc/files/patch-ae --- wamcc.orig/files/patch-ae Mon Nov 1 04:46:48 1999 +++ wamcc/files/patch-ae Wed Jun 4 10:57:50 2003 @@ -1,14 +1,12 @@ ---- src/machine.c.orig Sun Dec 18 12:15:59 1994 -+++ src/machine.c Tue Sep 14 04:16:29 1999 -@@ -52,7 +52,11 @@ - +--- src/machine.c.orig Wed Jun 4 10:56:56 2003 ++++ src/machine.c Wed Jun 4 10:57:22 2003 +@@ -53,7 +53,9 @@ #endif + #ifndef M_pc_linux_elf +#if !defined(M_i386_freebsd) && !defined(M_alpha_freebsd) -+ extern char *sys_errlist[]; -+ +#endif - + #endif diff -urN wamcc.orig/pkg-plist wamcc/pkg-plist --- wamcc.orig/pkg-plist Mon Nov 1 04:46:48 1999 +++ wamcc/pkg-plist Wed Jun 4 11:20:14 2003 @@ -1,7 +1,7 @@ bin/bmf_wamcc bin/hex2pl bin/pl2hex -bin/w_gcc +bin/w_%%CC%% bin/wamcc include/wamcc/archi.h include/wamcc/atom_pred.h >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200306040942.h549gvID041766>