| @@ -1,33 +1,47 @@ | | | @@ -1,33 +1,47 @@ |
1 | $NetBSD: patch-ab,v 1.3 2011/04/17 07:46:05 asau Exp $ | | 1 | $NetBSD: patch-ab,v 1.4 2012/06/23 21:30:05 dholland Exp $ |
2 | | | 2 | |
3 | --- Makefile.orig 1999-02-09 08:24:08.000000000 +0300 | | 3 | - Use pkgsrc compiler and CFLAGS |
4 | +++ Makefile 2011-03-30 20:15:36.000000000 +0400 | | 4 | - get rid of strerr.c, it is a broken reimplementation of a standard function |
| | | 5 | - generate executable as "vscm" rather than plain "scheme" |
| | | 6 | |
| | | 7 | --- Makefile.orig 1999-02-09 05:24:08.000000000 +0000 |
| | | 8 | +++ Makefile |
5 | @@ -42,8 +42,8 @@ | | 9 | @@ -42,8 +42,8 @@ |
6 | # ``-DNDEBUG'' etc. | | 10 | # ``-DNDEBUG'' etc. |
7 | | | 11 | |
8 | | | 12 | |
9 | - CC = gcc | | 13 | - CC = gcc |
10 | - OPTFLAGS = -O2 | | 14 | - OPTFLAGS = -O2 |
11 | +# CC = gcc | | 15 | +# CC = gcc |
12 | +# OPTFLAGS = -O2 | | 16 | +# OPTFLAGS = -O2 |
13 | WARNFLAGS = -Wall -Wmissing-prototypes | | 17 | WARNFLAGS = -Wall -Wmissing-prototypes |
14 | DEBUGFLAGS = -g | | 18 | DEBUGFLAGS = -g |
15 | EXTRACFLAGS = -DADJUSTABLE_SFIXNUM_RANGE -DVSCM_POSIX | | 19 | EXTRACFLAGS = -DADJUSTABLE_SFIXNUM_RANGE -DVSCM_POSIX |
16 | @@ -183,7 +183,7 @@ | | 20 | @@ -183,7 +183,7 @@ DDP = -DDEFAULT_DUMP_PREFIX='"\#!/home/b |
17 | .DEFAULT: | | 21 | .DEFAULT: |
18 | @echo I hope, making $< is not necessary... | | 22 | @echo I hope, making $< is not necessary... |
19 | | | 23 | |
20 | -CFLAGS = $(A_OPTFLAGS) $(A_WARNFLAGS) $(A_DEBUGFLAGS) $(A_EXTRACFLAGS) $(DDP) | | 24 | -CFLAGS = $(A_OPTFLAGS) $(A_WARNFLAGS) $(A_DEBUGFLAGS) $(A_EXTRACFLAGS) $(DDP) |
21 | +CFLAGS += $(A_OPTFLAGS) $(A_WARNFLAGS) $(A_DEBUGFLAGS) $(A_EXTRACFLAGS) $(DDP) | | 25 | +CFLAGS += $(A_OPTFLAGS) $(A_WARNFLAGS) $(A_DEBUGFLAGS) $(A_EXTRACFLAGS) $(DDP) |
22 | LDFLAGS = $(A_OPTFLAGS) $(A_DEBUGFLAGS) $(A_EXTRALDFLAGS) | | 26 | LDFLAGS = $(A_OPTFLAGS) $(A_DEBUGFLAGS) $(A_EXTRALDFLAGS) |
23 | CLFLAGS = $(CFLAGS) $(A_EXTRALDFLAGS) | | 27 | CLFLAGS = $(CFLAGS) $(A_EXTRALDFLAGS) |
24 | LIBS = -lm $(A_EXTRALIBS) | | 28 | LIBS = -lm $(A_EXTRALIBS) |
25 | @@ -351,7 +351,7 @@ | | 29 | @@ -340,8 +340,7 @@ vbis.sort: vbis.tab |
| | | 30 | |
| | | 31 | non-ansi-lib: \ |
| | | 32 | non-ansi-lib(fileno.o) \ |
| | | 33 | - non-ansi-lib(realloc.o) \ |
| | | 34 | - non-ansi-lib(strerr.o) |
| | | 35 | + non-ansi-lib(realloc.o) |
| | | 36 | $(RANLIB) non-ansi-lib |
| | | 37 | @echo non-ansi-lib is now up to date |
| | | 38 | |
| | | 39 | @@ -351,7 +350,7 @@ non-ansi-lib: \ |
26 | $(FORCEDELETE) $*.o | | 40 | $(FORCEDELETE) $*.o |
27 | | | 41 | |
28 | scheme: $(OBJECTS) $(TMPLIBS) | | 42 | scheme: $(OBJECTS) $(TMPLIBS) |
29 | - $(CC) -o scheme $(LDFLAGS) $(OBJECTS) $(LIBS) -lc $(TMPLIBS) | | 43 | - $(CC) -o scheme $(LDFLAGS) $(OBJECTS) $(LIBS) -lc $(TMPLIBS) |
30 | + $(CC) -o vscm $(LDFLAGS) $(OBJECTS) $(LIBS) -lc $(TMPLIBS) | | 44 | + $(CC) -o vscm $(LDFLAGS) $(OBJECTS) $(LIBS) -lc $(TMPLIBS) |
31 | | | 45 | |
32 | .scheme-boot: compiler/O/repl.scb | | 46 | .scheme-boot: compiler/O/repl.scb |
33 | cp compiler/O/repl.scb .scheme-boot | | 47 | cp compiler/O/repl.scb .scheme-boot |