diff options
| author | jperkin <jperkin@pkgsrc.org> | 2018-10-01 09:47:06 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2018-10-01 09:47:06 +0000 |
| commit | 0123a515c2aaecf780b475930ebe8f101325748a (patch) | |
| tree | 46d552940a743eb0abc115b92afd2e2fc0ef6b70 | |
| parent | 58afb3ed3c0b29d9d717c5ddd3c35c3e7da9f628 (diff) | |
| download | pkgsrc-0123a515c2aaecf780b475930ebe8f101325748a.tar.gz | |
iperf: Remove bool redefine which breaks C++ headers.
| -rw-r--r-- | net/iperf/Makefile | 10 | ||||
| -rw-r--r-- | net/iperf/distinfo | 3 | ||||
| -rw-r--r-- | net/iperf/patches/patch-configure | 22 |
3 files changed, 29 insertions, 6 deletions
diff --git a/net/iperf/Makefile b/net/iperf/Makefile index 26383b5439a..f8c045d9996 100644 --- a/net/iperf/Makefile +++ b/net/iperf/Makefile @@ -1,19 +1,19 @@ -# $NetBSD: Makefile,v 1.21 2014/11/28 10:30:52 bsiegert Exp $ +# $NetBSD: Makefile,v 1.22 2018/10/01 09:47:06 jperkin Exp $ DISTNAME= iperf-2.0.5 PKGREVISION= 1 CATEGORIES= net benchmarks MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=iperf/} +PATCH_SITES= http://sourceforge.net/p/iperf/patches/28/attachment/ +PATCHFILES= nomaxcpu.patch +PATCH_DIST_STRIP=-p1 + MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://iperf.sourceforge.net/ COMMENT= TCP and UDP bandwidth performance measurement tool LICENSE= modified-bsd -PATCHFILES= nomaxcpu.patch -PATCH_SITES= http://sourceforge.net/p/iperf/patches/28/attachment/ -PATCH_DIST_STRIP=-p1 - .include "../../mk/bsd.prefs.mk" .if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) diff --git a/net/iperf/distinfo b/net/iperf/distinfo index eaff0e44e58..0daf3e5e3bc 100644 --- a/net/iperf/distinfo +++ b/net/iperf/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2015/11/04 00:35:05 agc Exp $ +$NetBSD: distinfo,v 1.11 2018/10/01 09:47:06 jperkin Exp $ SHA1 (iperf-2.0.5.tar.gz) = 7302792dcb1bd7aeba032fef6d3dcc310e4d113f RMD160 (iperf-2.0.5.tar.gz) = 975d971974437136ae72bb17c0f776ea92eaf878 @@ -10,3 +10,4 @@ SHA512 (nomaxcpu.patch) = 91accee7fe57e93ed99e91ec18a09f449f5310952748ed8fb2d4f0 Size (nomaxcpu.patch) = 3354 bytes SHA1 (patch-ab) = e10e9119c5e830c186630aca72536ed1431fdbdc SHA1 (patch-ac) = 83479534caf61cf034453e1953e9ed5618f3f74c +SHA1 (patch-configure) = 1295b2022beb24ac809b62f9f919c70368545f01 diff --git a/net/iperf/patches/patch-configure b/net/iperf/patches/patch-configure new file mode 100644 index 00000000000..303d30ed273 --- /dev/null +++ b/net/iperf/patches/patch-configure @@ -0,0 +1,22 @@ +$NetBSD: patch-configure,v 1.1 2018/10/01 09:47:06 jperkin Exp $ + +Remove bool redefine which breaks C++ headers. + +--- configure.orig 2010-04-10 19:23:05.000000000 +0000 ++++ configure +@@ -6961,15 +6961,8 @@ $as_echo "$ac_cv_sizeof_bool" >&6; } + + + +-cat >>confdefs.h <<_ACEOF +-#define SIZEOF_BOOL $ac_cv_sizeof_bool +-_ACEOF + + +-if test "$ac_cv_sizeof_bool" = 0 ; then +- $as_echo "#define bool int" >>confdefs.h +- +-fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if true is defined" >&5 + $as_echo_n "checking if true is defined... " >&6; } |