From 875982fb7dff2fcdf2274fe7f1d27d2753e6dbf1 Mon Sep 17 00:00:00 2001
From: dmcmahill <dmcmahill@pkgsrc.org>
Date: Tue, 25 Nov 2003 22:42:30 +0000
Subject: don't pass the ARCH variable to the c compiler.  Its not used
 intentionally and it can break if a system uses ARCH for other purposes. 
 Noted in recent bulk builds.

---
 benchmarks/nttcp/distinfo         |  4 ++--
 benchmarks/nttcp/patches/patch-aa | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'benchmarks')

diff --git a/benchmarks/nttcp/distinfo b/benchmarks/nttcp/distinfo
index a47b857d999..5d07d98d758 100644
--- a/benchmarks/nttcp/distinfo
+++ b/benchmarks/nttcp/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2003/09/19 18:11:44 wiz Exp $
+$NetBSD: distinfo,v 1.4 2003/11/25 22:42:30 dmcmahill Exp $
 
 SHA1 (nttcp-1.47.tar.gz) = 28de7d65074e7546babdfa42b3b88fd8baa2be88
 Size (nttcp-1.47.tar.gz) = 25693 bytes
-SHA1 (patch-aa) = 1699c1fbaaa703fbda32325a2fe395c9018af459
+SHA1 (patch-aa) = 98f93947b4d1e650ad371756463377a7c54704a3
 SHA1 (patch-ab) = f684e6de0fa6df8f28a6372d5dd0bf8e1eee896f
diff --git a/benchmarks/nttcp/patches/patch-aa b/benchmarks/nttcp/patches/patch-aa
index ae09663e2d3..b8a1a9b11e7 100644
--- a/benchmarks/nttcp/patches/patch-aa
+++ b/benchmarks/nttcp/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2003/09/19 18:11:45 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2003/11/25 22:42:30 dmcmahill Exp $
 
 --- Makefile.orig	Mon Dec 18 10:17:20 2000
-+++ Makefile	Fri Sep 19 16:31:34 2003
++++ Makefile
 @@ -108,13 +108,13 @@
  #DBG=	-Wall -g
  #INC=	
@@ -23,17 +23,18 @@ $NetBSD: patch-aa,v 1.3 2003/09/19 18:11:45 wiz Exp $
  
  ## For SGI IRIX 5.3, 6.2 (cc or gcc)
  #ARCH=
-@@ -151,10 +151,13 @@
+@@ -151,9 +151,12 @@ INC=	
  VERSION=	1.47
  #prefix=		/usr/local/dist/DIR/nttcp-$(VERSION)
  #prefix=		/usr/local
 -prefix=		/usr/local/opt/nttcp-$(VERSION)
+-CFLAGS =	$(ARCH) $(DBG) $(DEF) $(INC) $(OPT) -DVERSION=\"$(VERSION)\"
 +#prefix=		/usr/local/opt/nttcp-$(VERSION)
 +prefix=		${PREFIX}
- CFLAGS =	$(ARCH) $(DBG) $(DEF) $(INC) $(OPT) -DVERSION=\"$(VERSION)\"
++CFLAGS =	$(DBG) $(DEF) $(INC) $(OPT) -DVERSION=\"$(VERSION)\"
  LFLAGS = 	$(DBG) 
- 
-+all:		nttcp
 +
++all:		nttcp
+ 
  nttcp:		nttcp.o support.o
  		$(CC) $(LFLAGS) nttcp.o -o nttcp support.o $(LIB)
-- 
cgit v1.2.3