diff options
| author | wiz <wiz@pkgsrc.org> | 2003-09-19 18:11:43 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2003-09-19 18:11:43 +0000 |
| commit | 469287aeac45e5f64384f492be442cd9213b7a8e (patch) | |
| tree | 8daf8bf3d24af1f025c6f277127794bf15dd8469 /benchmarks | |
| parent | bebf891a2d47617e7883d0b49145eb69b6d7b99e (diff) | |
| download | pkgsrc-469287aeac45e5f64384f492be442cd9213b7a8e.tar.gz | |
Make compile on Solaris. From Jonathan Perkin in PR 22859.
Diffstat (limited to 'benchmarks')
| -rw-r--r-- | benchmarks/nttcp/Makefile | 8 | ||||
| -rw-r--r-- | benchmarks/nttcp/distinfo | 4 | ||||
| -rw-r--r-- | benchmarks/nttcp/patches/patch-aa | 28 |
3 files changed, 24 insertions, 16 deletions
diff --git a/benchmarks/nttcp/Makefile b/benchmarks/nttcp/Makefile index 8e708da8a5b..7b25fd5f4ee 100644 --- a/benchmarks/nttcp/Makefile +++ b/benchmarks/nttcp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/07/17 21:24:33 grant Exp $ +# $NetBSD: Makefile,v 1.3 2003/09/19 18:11:43 wiz Exp $ DISTNAME= nttcp-1.47 CATEGORIES= benchmarks net @@ -8,6 +8,12 @@ MAINTAINER= thorpej@NetBSD.org HOMEPAGE= http://www.leo.org/~elmar/nttcp/ COMMENT= New TCP testing and performance measuring tool +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "SunOS" +MAKE_ENV+= LIB="-lsocket -lnsl" +.endif + do-install: cd ${WRKSRC} ; \ ${INSTALL_PROGRAM} nttcp ${PREFIX}/bin/nttcp ; \ diff --git a/benchmarks/nttcp/distinfo b/benchmarks/nttcp/distinfo index 9144675311e..a47b857d999 100644 --- a/benchmarks/nttcp/distinfo +++ b/benchmarks/nttcp/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2002/08/21 06:36:35 simonb Exp $ +$NetBSD: distinfo,v 1.3 2003/09/19 18:11:44 wiz Exp $ SHA1 (nttcp-1.47.tar.gz) = 28de7d65074e7546babdfa42b3b88fd8baa2be88 Size (nttcp-1.47.tar.gz) = 25693 bytes -SHA1 (patch-aa) = 4865a0daf25b1ebbbb7e3e01014c50b9c16558a6 +SHA1 (patch-aa) = 1699c1fbaaa703fbda32325a2fe395c9018af459 SHA1 (patch-ab) = f684e6de0fa6df8f28a6372d5dd0bf8e1eee896f diff --git a/benchmarks/nttcp/patches/patch-aa b/benchmarks/nttcp/patches/patch-aa index 3fa60076cd6..ae09663e2d3 100644 --- a/benchmarks/nttcp/patches/patch-aa +++ b/benchmarks/nttcp/patches/patch-aa @@ -1,13 +1,18 @@ -$NetBSD: patch-aa,v 1.2 2002/08/21 06:36:35 simonb Exp $ +$NetBSD: patch-aa,v 1.3 2003/09/19 18:11:45 wiz Exp $ ---- Makefile.orig Mon Dec 18 21:17:20 2000 -+++ Makefile -@@ -108,8 +108,16 @@ +--- Makefile.orig Mon Dec 18 10:17:20 2000 ++++ Makefile Fri Sep 19 16:31:34 2003 +@@ -108,13 +108,13 @@ #DBG= -Wall -g #INC= -# For FreeBSD -ARCH= -DFreeBSD +-LIB= +-OPT= -O2 +-CC= cc +-DBG= +-INC= +## For FreeBSD +#ARCH= -DFreeBSD +#LIB= @@ -15,13 +20,10 @@ $NetBSD: patch-aa,v 1.2 2002/08/21 06:36:35 simonb Exp $ +#CC= cc +#DBG= +#INC= -+ -+# For NetBSD -+ARCH= - LIB= - OPT= -O2 - CC= cc -@@ -151,9 +159,12 @@ + + ## For SGI IRIX 5.3, 6.2 (cc or gcc) + #ARCH= +@@ -151,10 +151,13 @@ VERSION= 1.47 #prefix= /usr/local/dist/DIR/nttcp-$(VERSION) #prefix= /usr/local @@ -30,8 +32,8 @@ $NetBSD: patch-aa,v 1.2 2002/08/21 06:36:35 simonb Exp $ +prefix= ${PREFIX} CFLAGS = $(ARCH) $(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) |