From 4bf8d2a268f6dbb9d0ed7c49fd704add7ea4c452 Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 19 Sep 2003 18:06:34 +0000 Subject: Make compile on Solaris. From Jonathan Perkin in PR 22857. --- benchmarks/httperf/Makefile | 8 +++++++- benchmarks/httperf/distinfo | 3 ++- benchmarks/httperf/patches/patch-aa | 17 +++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 benchmarks/httperf/patches/patch-aa (limited to 'benchmarks/httperf') diff --git a/benchmarks/httperf/Makefile b/benchmarks/httperf/Makefile index fdb3437800c..3a3a973c047 100644 --- a/benchmarks/httperf/Makefile +++ b/benchmarks/httperf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/07/17 21:24:28 grant Exp $ +# $NetBSD: Makefile,v 1.5 2003/09/19 18:06:34 wiz Exp $ # DISTNAME= httperf-0.6 @@ -13,6 +13,12 @@ LICENSE= no-commercial-use USE_GMAKE= yes +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "SunOS" +LDFLAGS+= -lsocket -lnsl -lresolv +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/httperf ${LOCALBASE}/bin/httperf ${INSTALL_MAN} ${WRKSRC}/httperf.man ${LOCALBASE}/man/man1/httperf.1 diff --git a/benchmarks/httperf/distinfo b/benchmarks/httperf/distinfo index ea406fe5092..2d0da60ead3 100644 --- a/benchmarks/httperf/distinfo +++ b/benchmarks/httperf/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/04/20 09:13:26 agc Exp $ +$NetBSD: distinfo,v 1.3 2003/09/19 18:06:35 wiz Exp $ SHA1 (httperf-0.6.tar.gz) = 6e0bcc21e2a94061b231c50182528a17ba22f14f Size (httperf-0.6.tar.gz) = 85351 bytes +SHA1 (patch-aa) = eb5e6431c62f1ec631a0d6b598de0e4029dc97fc diff --git a/benchmarks/httperf/patches/patch-aa b/benchmarks/httperf/patches/patch-aa new file mode 100644 index 00000000000..c6dde82f3f6 --- /dev/null +++ b/benchmarks/httperf/patches/patch-aa @@ -0,0 +1,17 @@ +$NetBSD: patch-aa,v 1.1 2003/09/19 18:06:36 wiz Exp $ + +--- Makefile.orig Tue Jun 2 04:06:52 1998 ++++ Makefile Fri Sep 19 15:34:28 2003 +@@ -38,9 +38,9 @@ + CPPDEBUG := -DDEBUG $(CPPDEBUG) + CPPOPTIM := -DNDEBUG $(CPPOPTIM) + +-CPPFLAGS = -I. -Ilib $(CPP$(HOW)) +-CFLAGS = $(CONFIG) $(CFLAGS$(HOW)) +-LDFLAGS = $(LDFLAGS$(HOW)) ++CPPFLAGS += -I. -Ilib $(CPP$(HOW)) ++#CFLAGS = $(CONFIG) $(CFLAGS$(HOW)) ++#LDFLAGS = $(LDFLAGS$(HOW)) + + HTTPERF = httperf object call conn sess core event http timer $(EXTRA) + -- cgit v1.2.3