Move the bug-fix to the makefile itself, as otherwise it does not always

build.
This commit is contained in:
espie 2001-02-22 22:06:10 +00:00
parent 6e3f84d42d
commit c79038deed
3 changed files with 14 additions and 15 deletions

View File

@ -1,5 +1,5 @@
# Ports collection makefile for "hoc", the High Order Calculator
# $OpenBSD: Makefile,v 1.15 2000/12/14 13:23:00 espie Exp $
# $OpenBSD: Makefile,v 1.16 2001/02/22 22:06:10 espie Exp $
DISTNAME= hoc
PKGNAME= hoc-1.1
@ -18,13 +18,6 @@ PERMIT_DISTFILES_FTP= Yes
ALL_TARGET= hoc
MAKE_FILE= makefile
# Bug-fix for gcc 2.95.2
.if ${MACHINE_ARCH} == "i386"
pre-build:
cd ${WRKSRC} && make code.o CFLAGS=-O0
.endif
WRKDIST= ${WRKDIR}
do-install:

View File

@ -1,6 +1,6 @@
--- makefile.orig Mon Apr 10 02:37:28 2000
+++ makefile Mon Apr 10 02:39:09 2000
@@ -1,11 +1,11 @@
--- makefile.orig Thu Feb 22 23:04:59 2001
+++ makefile Thu Feb 22 23:06:41 2001
@@ -1,26 +1,30 @@
YFLAGS = -d
-CFLAGS = -g
+#CFLAGS = -g
@ -14,7 +14,13 @@
hoc.o code.o init.o symbol.o: hoc.h
@@ -14,13 +14,12 @@ code.o init.o symbol.o: x.tab.h
code.o init.o symbol.o: x.tab.h
+.if ${MACHINE_ARCH} == "i386"
+code.o: code.c
+ $(CC) $(CFLAGS) -O0 -c code.c
+.endif
+
x.tab.h: y.tab.h
-cmp -s x.tab.h y.tab.h || cp y.tab.h x.tab.h

View File

@ -1,6 +1,6 @@
--- hoc.y.orig Wed Sep 16 15:27:03 1998
+++ hoc.y Wed Sep 16 15:27:54 1998
@@ -284,13 +284,13 @@
--- hoc.y.orig Thu Feb 22 23:04:59 2001
+++ hoc.y Thu Feb 22 23:04:59 2001
@@ -284,13 +284,13 @@ execerror(char* s, char* t) /* recover f
}
void