diff options
| author | dmcmahill <dmcmahill@pkgsrc.org> | 2000-05-31 04:57:20 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill@pkgsrc.org> | 2000-05-31 04:57:20 +0000 |
| commit | 2a6325894544bfcc53564481ce2579bede9d987b (patch) | |
| tree | e494ee70cd85ba23a204b5ff01ff81a420c160bb /emulators/stella | |
| parent | a6a54c3921364051dec9986759bb0c2283957c57 (diff) | |
| download | pkgsrc-2a6325894544bfcc53564481ce2579bede9d987b.tar.gz | |
work around a c++ -O2 bug on sparc and pmax by not using -O2 for the problem
file on those 2 machines.
fixes recently noted compile problems.
Diffstat (limited to 'emulators/stella')
| -rw-r--r-- | emulators/stella/files/patch-sum | 4 | ||||
| -rw-r--r-- | emulators/stella/patches/patch-ac | 29 |
2 files changed, 19 insertions, 14 deletions
diff --git a/emulators/stella/files/patch-sum b/emulators/stella/files/patch-sum index 6127be5350b..d5fa611eeb8 100644 --- a/emulators/stella/files/patch-sum +++ b/emulators/stella/files/patch-sum @@ -1,5 +1,5 @@ -$NetBSD: patch-sum,v 1.2 2000/01/22 23:44:30 tron Exp $ +$NetBSD: patch-sum,v 1.3 2000/05/31 04:57:20 dmcmahill Exp $ MD5 (patch-aa) = 0746806eb97721a876eb60f42fa18f5f MD5 (patch-ab) = 0841422715838603e83bfe9826975081 -MD5 (patch-ac) = 21f7674db61d697dcc6546fb235f90ed +MD5 (patch-ac) = dc322dfd44c7fccc86862dfc52940d31 diff --git a/emulators/stella/patches/patch-ac b/emulators/stella/patches/patch-ac index dc767e94a00..ca90516d47c 100644 --- a/emulators/stella/patches/patch-ac +++ b/emulators/stella/patches/patch-ac @@ -1,9 +1,6 @@ -$NetBSD: patch-ac,v 1.1.1.1 1999/05/18 23:14:16 tv Exp $ - --- makefile.orig Sat Feb 27 09:29:46 1999 -+++ makefile Tue May 18 10:37:57 1999 -@@ -34,10 +34,8 @@ - ## ++++ makefile Tue May 30 21:16:47 2000 +@@ -35,8 +35,6 @@ ##============================================================================ -CXX = g++ @@ -13,18 +10,14 @@ $NetBSD: patch-ac,v 1.1.1.1 1999/05/18 23:14:16 tv Exp $ -LDFLAGS = LDLIBS = - SRC = .. -@@ -46,7 +44,7 @@ - +@@ -47,5 +45,5 @@ INCLUDES = -I. -I$(CORE) -I$(CORE)/m6502/src -I$(CORE)/m6502/src/bspf/src -CXXFLAGS = -O -Wall $(INCLUDES) $(SYS_INCLUDES) +CXXFLAGS += $(INCLUDES) $(SYS_INCLUDES) default: - @echo "" -@@ -78,10 +76,9 @@ - unix-x: +@@ -79,8 +77,7 @@ make xstella \ INCLUDES="$(INCLUDES) -I$(UI)/x11 -I$(UI)/sound" \ - SYS_INCLUDES="" \ @@ -35,4 +28,16 @@ $NetBSD: patch-ac,v 1.1.1.1 1999/05/18 23:14:16 tv Exp $ + LDLIBS="-L$(X11BASE)/lib -lX11 -lXext" \ OBJS="mainX11.o SndUnix.o" - linux-x: +@@ -325,6 +322,12 @@ + $(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CORE)/m6502/src/M6502Low.cxx + ++.if (${MACHINE_ARCH} == "mipsel") || (${MACHINE_ARCH} == "sparc") ++# avoide compiler bug on some systems ++M6502Hi.o: $(CORE)/m6502/src/M6502Hi.cxx ++ $(CXX) -c -fno-rtti -fno-rtti $(INCLUDES) $(SYS_INCLUDES) $(OPTIONS) $(CORE)/m6502/src/M6502Hi.cxx ++.else + M6502Hi.o: $(CORE)/m6502/src/M6502Hi.cxx + $(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CORE)/m6502/src/M6502Hi.cxx ++.endif + + NullDev.o: $(CORE)/m6502/src/NullDev.cxx |