diff options
| author | dmcmahill <dmcmahill@pkgsrc.org> | 2001-05-07 22:09:14 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill@pkgsrc.org> | 2001-05-07 22:09:14 +0000 |
| commit | 6aa4a4400082c787490508dd25bcef52bf065b50 (patch) | |
| tree | 2eabdefdedeea24278cdcf02cf2f74f4489b6645 /math/tochnog/patches | |
| parent | e90e7f15d7602d5a93ab4ab04492bc903cb6b117 (diff) | |
| download | pkgsrc-6aa4a4400082c787490508dd25bcef52bf065b50.tar.gz | |
avoid c++ -O2 bug on alpha.
Diffstat (limited to 'math/tochnog/patches')
| -rw-r--r-- | math/tochnog/patches/patch-aa | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/math/tochnog/patches/patch-aa b/math/tochnog/patches/patch-aa index e8d31c1dbef..5fa4505be4a 100644 --- a/math/tochnog/patches/patch-aa +++ b/math/tochnog/patches/patch-aa @@ -1,30 +1,26 @@ -$NetBSD: patch-aa,v 1.2 2001/04/29 16:17:51 jtb Exp $ +$NetBSD: patch-aa,v 1.3 2001/05/07 22:09:15 dmcmahill Exp $ ---- makefile.orig Sun Jan 28 09:45:23 2001 -+++ makefile -@@ -21,7 +21,7 @@ - PROFILE= +avoid the c++ with optimization compiler bug on one particular file. + +--- makefile.orig Sun Apr 8 13:13:35 2001 ++++ makefile Mon May 7 17:50:13 2001 +@@ -22,5 +22,5 @@ # *********** default environment ******************* -SRC_CPP=cc +SRC_CPP=$(CC) SRC_C=c SYS_FILE=sysother - BCPP=-P -@@ -65,7 +65,7 @@ - ALL_LIB= $(PETSC_LIB) $(SUPERLU_LIB) $(F2C) +@@ -66,5 +66,5 @@ # *********** default platform ******************* -default: linux_old +default: netbsd # single and multi-processor windows; borland c++ compiler - # set SYS_FILE above to syswin32 for multi-processor -@@ -230,6 +230,18 @@ - "COMPILER_CPP=gcc" \ - "LINK_FLAGS_BEFORE=" \ +@@ -232,4 +232,17 @@ "LINK_FLAGS_AFTER= $(PROFILE) $(ALL_LIB) -lstdcpp -lm -o tochnog" -+ + +netbsd: + make tochnog \ + "SYS_FILE=sysother" \ @@ -35,7 +31,21 @@ $NetBSD: patch-aa,v 1.2 2001/04/29 16:17:51 jtb Exp $ + "COMPILER_CPP=$(CXX)" \ + "COMPILER_FLAGS=$(CFLAGS) -ansi -c $(ALL_INCLUDE)" \ + "LINK_FLAGS_BEFORE=" \ -+ "LINK_FLAGS_AFTER= $(ALL_LIB) -lm -o tochnog" - ++ "LINK_FLAGS_AFTER= $(ALL_LIB) -lm -o tochnog" \ ++ "MACHINE_ARCH=$(MACHINE_ARCH)" ++ tochnog: adjust.$(OBJ) area.$(OBJ) \ beam.$(OBJ) bounda.$(OBJ) calcul.$(OBJ) \ +@@ -324,6 +337,12 @@ + $(COMPILER_CPP) $(COMPILER_FLAGS) $(BCPP) $(VCPP)date.$(SRC_CPP) + ++COMPILER_FLAGS_NOOPT=${COMPILER_FLAGS:C/-O.*//} ++ + database.$(OBJ): database.$(SRC_CPP) tochnog.h ++.if ${MACHINE_ARCH} == "alpha" ++ $(COMPILER_CPP) $(COMPILER_FLAGS_NOOPT) $(BCPP) $(VCPP)database.$(SRC_CPP) ++.else + $(COMPILER_CPP) $(COMPILER_FLAGS) $(BCPP) $(VCPP)database.$(SRC_CPP) ++.endif + + delete.$(OBJ): delete.$(SRC_CPP) tochnog.h |