summaryrefslogtreecommitdiff
path: root/benchmarks/dbench
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2003-09-19 18:08:14 +0000
committerwiz <wiz@pkgsrc.org>2003-09-19 18:08:14 +0000
commitbebf891a2d47617e7883d0b49145eb69b6d7b99e (patch)
tree43dd125fa5bac6682f44a3a69970cfcb8eda6c28 /benchmarks/dbench
parent4bf8d2a268f6dbb9d0ed7c49fd704add7ea4c452 (diff)
downloadpkgsrc-bebf891a2d47617e7883d0b49145eb69b6d7b99e.tar.gz
Make compile on Solaris. From Jonathan Perkin in PR 22858.
Diffstat (limited to 'benchmarks/dbench')
-rw-r--r--benchmarks/dbench/Makefile9
-rw-r--r--benchmarks/dbench/distinfo4
-rw-r--r--benchmarks/dbench/patches/patch-ab32
3 files changed, 35 insertions, 10 deletions
diff --git a/benchmarks/dbench/Makefile b/benchmarks/dbench/Makefile
index 1d4720ada80..94305fcc5c5 100644
--- a/benchmarks/dbench/Makefile
+++ b/benchmarks/dbench/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/07/17 21:24:38 grant Exp $
+# $NetBSD: Makefile,v 1.3 2003/09/19 18:08:14 wiz Exp $
#
DISTNAME= dbench-1.3
+WRKSRC= ${WRKDIR}/dbench
CATEGORIES= benchmarks
MASTER_SITES= ftp://dnuc.polyn.kiae.su/pub/dbench/
@@ -9,7 +10,11 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://samba.org/ftp/tridge/dbench/README
COMMENT= Simulation of the Ziff-Davis netbench benchmark
-WRKSRC= ${WRKDIR}/dbench
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+MAKE_ENV+= DB_LDFLAGS="-lrt" TB_LDFLAGS="-lsocket -lnsl"
+.endif
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/dbench ${PREFIX}/bin/dbench
diff --git a/benchmarks/dbench/distinfo b/benchmarks/dbench/distinfo
index 56fd75fef75..c731aa21d47 100644
--- a/benchmarks/dbench/distinfo
+++ b/benchmarks/dbench/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/07/17 15:11:44 agc Exp $
+$NetBSD: distinfo,v 1.2 2003/09/19 18:08:14 wiz Exp $
SHA1 (dbench-1.3.tar.gz) = b46f72ac0a81acf7a0f368e20e5d83ee3932a35a
Size (dbench-1.3.tar.gz) = 266746 bytes
SHA1 (patch-aa) = 1c34848d3ce3294a1ae228243ff6fcae8a874826
-SHA1 (patch-ab) = 3d0d79e1542368d63534b994cb96fb0602acca24
+SHA1 (patch-ab) = 63d2fd91fcd1e282179ba10c9d6ae06e89f6b945
diff --git a/benchmarks/dbench/patches/patch-ab b/benchmarks/dbench/patches/patch-ab
index e09c87be217..b4790828245 100644
--- a/benchmarks/dbench/patches/patch-ab
+++ b/benchmarks/dbench/patches/patch-ab
@@ -1,13 +1,33 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/07/17 15:11:44 agc Exp $
+$NetBSD: patch-ab,v 1.2 2003/09/19 18:08:16 wiz Exp $
---- Makefile 2003/07/17 14:51:51 1.1
-+++ Makefile 2003/07/17 14:52:17
-@@ -2,7 +2,7 @@
+--- Makefile.orig Mon Sep 10 05:21:01 2001
++++ Makefile Fri Sep 19 16:06:02 2003
+@@ -1,8 +1,8 @@
+ VERSION = 1.2.01
- CC = gcc
- CFLAGS = -O2 -Wall
+-CC = gcc
+-CFLAGS = -O2 -Wall
-CPPFLAGS = "-DVERSION=\"$(VERSION)\""
++#CC = gcc
++#CFLAGS = -O2 -Wall
+CPPFLAGS = "-DVERSION=\"$(VERSION)\"" -DPREFIX='"${PREFIX}"'
DB_OBJS = fileio.o util.o dbench.o child.o
TB_OBJS = sockio.o util.o dbench.o child.o socklib.o
+@@ -11,13 +11,13 @@
+ all: dbench tbench tbench_srv
+
+ dbench: $(DB_OBJS)
+- $(CC) -o $@ $(DB_OBJS)
++ $(CC) -o $@ $(DB_OBJS) $(DB_LDFLAGS)
+
+ tbench: $(TB_OBJS)
+- $(CC) -o $@ $(TB_OBJS)
++ $(CC) -o $@ $(TB_OBJS) $(TB_LDFLAGS)
+
+ tbench_srv: $(SRV_OBJS)
+- $(CC) -o $@ $(SRV_OBJS)
++ $(CC) -o $@ $(SRV_OBJS) $(TB_LDFLAGS)
+
+ clean:
+ rm -f *.o *~ dbench tbench tbench_srv