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

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 50 insertions, 8 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/Manifest b/net-misc/iperf/Manifest
index badcbddeaa74..58ac97637b90 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX iperf-3.0.5-flags.patch 1323 SHA256 239b00aa090e7cfbd45f14ef0dc88a90fa24760f05cf005a17bded6df342e01f SHA512 d5e106b9b6fdc704e1e8d5c87f767a912a3e643994b51f09fee34fffcf9007b3eb91adcf3b87e04f90c994e29691dff0e400fb2f13a94e68c58183a39d833403 WHIRLPOOL 9dee2ef383d5dcc39358964be09e0d19d1a5cb0fe864067c6274dacfd994380c1bd4a5afd0789bcd4052af31c36578dc3a62c196134442b27f5b2c844ed06768
 AUX iperf-bidirectional-tcp-server.patch 709 SHA256 732fea9c648dcb9c75213d49275567228c9cbcb49a1eaa32b84fe6fd8af60894 SHA512 b08f6c9e884f9a6b0945c806d471d5007c0e357e90fc344f19f17cf785fb603f0da4c7de667f85823c66f39f58b0a0be46359284730421dc9a573baa67ea6d28 WHIRLPOOL 368615b1ebc63b3959b1519e6f6f2431f7c25aa3c20094a7e8b6c76deec9ef6631be0d9fe4de1c4b4f71ec687c5c01ac834a16784c0ad4cb37270a551d40bbb4
 AUX iperf-cast-to-max_size_t-instead-of-int.patch 904 SHA256 c7c7630151f53a24e504359c8f773daf5b08e81c782b87937de12152b91f1502 SHA512 a3a8ab1c745dce9ba5d7f52747490ced0a485b9f92d254e64bdbc4302a0ab057f4203b1e85ba680db8828b6390b38d95eb3c65c74a4679cf81e9760838ecf777 WHIRLPOOL b4282e3fd72ce472576a9110f32b5d9c770e38874f5f5ce94c7b1373e7bbb0a77ed61a2fcdcf9a708efaebe8339186337dd32ad54de335e36a837f8f8d4d3c11
 AUX iperf-die-on-bind-fail.patch 812 SHA256 f56e0affd91a41675b8f756c969f175723dfa2b5ab9dba8b4f20b94f1fe5b3c5 SHA512 0986619d046c4a7f792bdc5b18e600840b70df14bbe5e78bd4240df57989ea82a8fb8df0f6589a4d182e7fb8035b1d6b1472edbafe3f7cf4e361550fdbea6487 WHIRLPOOL 92b640e4ab4dd706c570fe41ecb97ea5e20feb4acd0469addbe8955d769fdbc40e958c005d03e3625858509492b209da13b589aca33bf2433dab364533bfba86
@@ -15,13 +16,13 @@ DIST iperf-3.0.5.tar.gz 397848 SHA256 bb81c724709dbb28462da14bdf9f443e8f38bfc4e3
 EBUILD iperf-2.0.5-r1.ebuild 1031 SHA256 1a13cd6c39ed46bc5c72710b33db2a04273969e0a78a6ac520baa6f2a8603545 SHA512 87320575144d0b0599d9123c8513993a2bc2af16802a93041c1a1e93a09eb54f0008e06cc4801a113026ceb6ac43a0fb0cb34b5837efeaac6d6433af2e0e4ed2 WHIRLPOOL 0ce1e0582564afbe8b36235201b614332041480ecbe5572a8382e6bf299d3363fc557a48bededb672980d296da9c0e68de38013eb9b5d5edbaf256dab0859dba
 EBUILD iperf-2.0.5-r2.ebuild 1148 SHA256 48b018d85d956880c34d91529d964d0f78ba89a95c977af7ab12908c9c391b43 SHA512 1bd55ddf95f3fcb2ea10d8464ecae6673183ee1101e9778a2e673888856cbdd5360e18f6a73413b5c85f43b05d2a43c95040441ff8fa1b07d03b2300a2031ec6 WHIRLPOOL 8a7c2ac9724525b42e71a439f5b7ef0727f74b7eb68961447bca6a664c8acb6684f0447ae0878e4647f1e34d3893d03f6233b59686f75ae5d90bef08956bf9c6
 EBUILD iperf-2.0.5.ebuild 1011 SHA256 3c88d1663ceb9207bdcf2b6244e78f232a5a7ac527d0d7f4e4f648816bb88c93 SHA512 2a45d819c2ccfcfddecbe837a7383c76afbd72248d772f4fe4ab211b1ba4ebc54c54b51dec4bb26f0499e15c649d9525ffc3af864d75c204051f21fba26a2a68 WHIRLPOOL 814bc373d1a838fc30612f6a53d2443e27ccc4753dba445ca1122220dd4d28aefde1118a8eff59b2d2926004f8b8f27a088771e369a3566c53578562d86875bc
-EBUILD iperf-3.0.5.ebuild 712 SHA256 7791eb25053b242dab00eb2348e0c87699bac14069caea5da6e0fdaa5413384b SHA512 5e026766758c943d7411aeabb086e3c842e6a566a14e9939804142d3c7abbbf1aa9bcf17370a5158393582423fb0ff50f1e48810e230379409fc3ba9f7dacde2 WHIRLPOOL ddbee47e3b15ab7f91d91b2107db98472463c474b2fa07a79a06512c668bbae84cf08d1c2941ebb76f8bc25aff7118d0a6af61f5ff1cf17efedf33eeaaf062e4
-MISC ChangeLog 5760 SHA256 45b3064f2dfc92299b7e25132657e31be3939e42ef757e08a781970743f37df0 SHA512 5d146dd391b189fdacfab5b79d4dd91550d00a6d44d765b57a7b90eeef7ef587bfaae457049cb31954d615dacfd1b32c2b7476c6483c633ae52686866b1c89d3 WHIRLPOOL 0b7a64816eb768a9c2d6176fa0aed3cabc022303bfe8292be039f4047fc872689dae64a7adafc5d664192c8f617a05e53b34ca55d4e5f4e209d4a68234cf9857
+EBUILD iperf-3.0.5.ebuild 793 SHA256 f4b6b91c8fc4d6c8d2c6a5ca92e6af6976765c516c089f39294bc16d28687a07 SHA512 9c81bf680fece329068260bc697e3fee8d30b1bf49cadf34a990d4962f80fe6e7c1f97229053203574bdc90dc273a08fa1c09363eeff9f9a02f566796d030b4c WHIRLPOOL b6380e3c68fb4c09ab7f48de28d161e96184aeb9e898209adc3aadf22acdc00e634e41cb7e3f98cea2fd1a923a9976ecbfccbbc8519b7843d37ce2e9067c9537
+MISC ChangeLog 5979 SHA256 1890cf9cb083524235739928cdabdaa42892f9f3c8bc1a5afc50fe6a656e1436 SHA512 be228f7a3fc159421ecb753a203c5b539a08afbae790c9a902f2f7f6c4b5a2d88d5a2a6939dc569e04a9ff099c55dd640eb8462fcd3ad561dc3555ab22a14d56 WHIRLPOOL b0c5141b357a5b51ee4f11d5c0e542a576057b072d6560e6ed19d56504338ded7075685e91e04bd88cb77c2f1e4499294eb78b5bb581bbac15a75e7aca9e07a5
 MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPJTG8ACgkQVWmRsqeSphPSGQCfZilmvJVolWd+EKMD+Vyxt64p
-RfcAn3xaFFkqQgYMLeFQNbE5Abhw4F1L
-=Q55u
+iEYEAREIAAYFAlPKcscACgkQVWmRsqeSphNQhwCfTB9G6c1TZMCflXUSDTfvUL6y
+OaQAni/4uTEw13oB6w96CoIFEA04bXFC
+=aVeG
 -----END PGP SIGNATURE-----
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)
 }