Do not inject -g into CFLAGS/LDFLAGS, do not create an additional profiled build (bug #517488 by Ronny Boesger).

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 44 insertions, 3 deletions

diff --git a/net-misc/iperf/ChangeLog b/net-misc/iperf/ChangeLog
index ae5bc5e56018..ada5ade1103a 100644
--- a/net-misc/iperf/ChangeLog
+++ b/net-misc/iperf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/iperf
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/ChangeLog,v 1.46 2014/07/18 16:33:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/ChangeLog,v 1.47 2014/07/19 13:29:42 jer Exp $
+
+  19 Jul 2014; Jeroen Roovers <jer@gentoo.org> iperf-3.0.5.ebuild,
+  +files/iperf-3.0.5-flags.patch:
+  Do not inject -g into CFLAGS/LDFLAGS, do not create an additional profiled
+  build (bug #517488 by Ronny Boesger).
 
 *iperf-3.0.5 (18 Jul 2014)
 
diff --git a/net-misc/iperf/files/iperf-3.0.5-flags.patch b/net-misc/iperf/files/iperf-3.0.5-flags.patch
new file mode 100644
index 000000000000..9c11c282c339
--- /dev/null
+++ b/net-misc/iperf/files/iperf-3.0.5-flags.patch
@@ -0,0 +1,31 @@
+* Do not inject -g
+* Do not make a profiled build
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,6 +1,6 @@
+ lib_LTLIBRARIES         = libiperf.la                                   # Build and install an iperf library
+ bin_PROGRAMS            = iperf3                                        # Build and install an iperf binary
+-noinst_PROGRAMS         = t_timer t_units t_uuid iperf3_profile         # Build, but don't install the test programs and a profiled version of iperf3
++noinst_PROGRAMS         = t_timer t_units t_uuid         # Build, but don't install the test programs and a profiled version of iperf3
+ include_HEADERS         = iperf_api.h # Defines the headers that get installed with the program
+ 
+ 
+@@ -37,14 +37,13 @@
+ 
+ # Specify the sources and various flags for the iperf binary
+ iperf3_SOURCES          = main.c
+-iperf3_CFLAGS           = -g
++iperf3_CFLAGS           =
+ iperf3_LDADD            = libiperf.la
+-iperf3_LDFLAGS          = -g
++iperf3_LDFLAGS          =
+ 
+ # Specify the sources and various flags for the profiled iperf binary. This
+ # binary recompiles all the source files to make sure they are all profiled.
+-iperf3_profile_SOURCES  = main.c \
+-						  $(libiperf_la_SOURCES)
++iperf3_profile_SOURCES  = main.c
+ 
+ iperf3_profile_CFLAGS   = -pg -g
+ iperf3_profile_LDADD    = libiperf.la
diff --git a/net-misc/iperf/iperf-3.0.5.ebuild b/net-misc/iperf/iperf-3.0.5.ebuild
index b397be8e3a67..17711a85aa2c 100644
--- a/net-misc/iperf/iperf-3.0.5.ebuild
+++ b/net-misc/iperf/iperf-3.0.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-3.0.5.ebuild,v 1.1 2014/07/18 16:33:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-3.0.5.ebuild,v 1.2 2014/07/19 13:29:42 jer Exp $
 
 EAPI=5
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
 LICENSE="BSD"
@@ -13,6 +13,11 @@ SRC_URI="https://codeload.github.com/esnet/${PN}/tar.gz/${PV} -> ${P}.tar.gz"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
 IUSE="static-libs"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-flags.patch
+	eautoreconf
+}
+
 src_configure() {
 	econf $(use_enable static-libs static)
 }