diff options
Diffstat (limited to 'math')
| -rw-r--r-- | math/tochnog/Makefile | 4 | ||||
| -rw-r--r-- | math/tochnog/distinfo | 4 | ||||
| -rw-r--r-- | math/tochnog/patches/patch-aa | 40 |
3 files changed, 30 insertions, 18 deletions
diff --git a/math/tochnog/Makefile b/math/tochnog/Makefile index eb4df4de37a..188d5d53270 100644 --- a/math/tochnog/Makefile +++ b/math/tochnog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/04/29 16:17:50 jtb Exp $ +# $NetBSD: Makefile,v 1.9 2001/05/07 22:09:14 dmcmahill Exp $ DISTNAME= tochnog-20010429 CATEGORIES= math @@ -15,6 +15,8 @@ WRKSRC= ${WRKDIR}/tochnog/src MAKEFILE= makefile ALL_TARGET= netbsd +MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} + post-patch: @${RM} -f ${WRKDIR}/tochnog/test/*.orig ${WRKDIR}/tochnog/tools/*.bat diff --git a/math/tochnog/distinfo b/math/tochnog/distinfo index c67a928bc2b..24b9a9aa0c0 100644 --- a/math/tochnog/distinfo +++ b/math/tochnog/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/04/29 16:17:50 jtb Exp $ +$NetBSD: distinfo,v 1.3 2001/05/07 22:09:14 dmcmahill Exp $ SHA1 (tochnog-20010429/tn.tar.gz) = a4628df82573b5b9ebf5deeb9f32c6068cff5fed Size (tochnog-20010429/tn.tar.gz) = 394723 bytes @@ -6,5 +6,5 @@ SHA1 (tochnog-20010429/tnu.ps.gz) = 9f41c9cf997f3e4ee60a735dd584bef19be69ef9 Size (tochnog-20010429/tnu.ps.gz) = 756685 bytes SHA1 (tochnog-20010429/tnp.ps.gz) = d12a0840f8cceae67dea8bd18a2405a05f356d9b Size (tochnog-20010429/tnp.ps.gz) = 41836 bytes -SHA1 (patch-aa) = c11e22272c8b64fff0556415ea9f90b9f318718a +SHA1 (patch-aa) = 256526e013cc652fae30328869244975c12fa4b8 SHA1 (patch-ab) = e90269af74181a3ce4be670b83ac07ff7e1a7c94 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 |