app-benchmarks/bonnie++: Respect CFLAGS (bug #239951) and LDFLAGS (bug #337463)

Package-Manager: portage-2.2_rc67_p185/cvs/Linux i686

4 files changed, 70 insertions, 2 deletions

diff --git a/app-benchmarks/bonnie++/ChangeLog b/app-benchmarks/bonnie++/ChangeLog
index 4fe723bc117c..aa2986ed7229 100644
--- a/app-benchmarks/bonnie++/ChangeLog
+++ b/app-benchmarks/bonnie++/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-benchmarks/bonnie++
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bonnie++/ChangeLog,v 1.34 2010/09/12 18:45:44 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bonnie++/ChangeLog,v 1.35 2010/09/27 22:55:56 sping Exp $
+
+*bonnie++-1.96-r1 (27 Sep 2010)
+
+  27 Sep 2010; Sebastian Pipping <sping@gentoo.org>
+  +bonnie++-1.96-r1.ebuild, +files/bonnie++-1.96-compile-flags.patch:
+  Respect CFLAGS (bug #239951) and LDFLAGS (bug #337463)
 
   12 Sep 2010; Michael Weber <xmw@gentoo.org> bonnie++-1.96.ebuild:
   Added ~arm keyword
diff --git a/app-benchmarks/bonnie++/Manifest b/app-benchmarks/bonnie++/Manifest
index a28733e1855d..3e79bbcbd481 100644
--- a/app-benchmarks/bonnie++/Manifest
+++ b/app-benchmarks/bonnie++/Manifest
@@ -3,11 +3,13 @@ AUX bonnie++-1.93c-missing_include.patch 1514 RMD160 c15b99879127e51dc6f2da755d5
 AUX bonnie++-1.94-64bit.patch 646 RMD160 52a1aaeb105a092cd09a4e24c0d68ca759e5661d SHA1 890fb4fa59cdef57fb8aa672d6c5e3a4b4aa7770 SHA256 4cf8cd8809d97558993faa838236d133eec38ba1971cebce140bbb032021674b
 AUX bonnie++-1.94-missing_include.patch 1514 RMD160 c15b99879127e51dc6f2da755d5df820ddd3b691 SHA1 6fe1b9282d09ae2c6fcf1c1ddf185d6b4e95ecd8 SHA256 b11d30969937e07af1153b9a32a96064c7ce08c6cee5b446a82eae0429028d90
 AUX bonnie++-1.95-homepage.patch 507 RMD160 237ce925fba32ada87f1ecab7ba1e06f7d22080d SHA1 a92700219359bc6f1252b877db356f36f7ebcfe2 SHA256 6a83a92f531c068aeae9f47922a5a930b1ec9fad467934a51c78d4694a9aae03
+AUX bonnie++-1.96-compile-flags.patch 611 RMD160 a15be6a0e05f32c9cf4f8699aad5c34961aceecd SHA1 82856e569af52d6914ee5f76fed21b0ec8a538e8 SHA256 795dec4e5d537d7a769adb1ec1cebd54b4eeb4ab2b3d6c805e3b9366bb2832e6
 DIST bonnie++-1.93c.tgz 109175 RMD160 8754ce76854464d8df3f4b4e3adafbe6ea4746bf SHA1 85f670f5b82accb62ca2cff82e94cbbaefd5aedb SHA256 1520b088613f4308d07d85af767cf01120420f8c2b674c66cb50feccfea905a9
 DIST bonnie++-1.95.tgz 98877 RMD160 cfe4e6894353110f9bef4bb4a54a5f87130d467d SHA1 6af8f89b037b14efaa402c8539606e07d8f3aa0f SHA256 8d04a9baa0c6090cb705ede9d60573d7a7a349ae3b5b2f7fffe6e610121cb051
 DIST bonnie++-1.96.tgz 105183 RMD160 f2bbcfb6b17b2baa0d268046aa8a994f6b41bfee SHA1 24a0e3de4dc98f905654f51ef6732b1b766e1378 SHA256 9c9d87bf09ac5a42a915ceeb9d8bb8358c0ca4642d86b85ed48ca5f15ee3456c
 EBUILD bonnie++-1.93c.ebuild 1002 RMD160 0b38c8cdfc334c379ea6141e3a70309735fc366e SHA1 43f42a05976c1a69beb3c717feff719440525804 SHA256 9c96482d1d4b3dddbe51a2303a42eb94c83113549462339fe8f45c53bf95684b
 EBUILD bonnie++-1.95.ebuild 1030 RMD160 47c33186ca37fd9690e53fc967e575c882ff933a SHA1 b3f21b8ea92dbb7fd0df91b8a3920ff3969ac3bf SHA256 cf3b5d97a709503affeef42df7c6840d9a1a8ff52e8972f7d248c60bbd616d74
+EBUILD bonnie++-1.96-r1.ebuild 997 RMD160 23e46205886a9286b1d8528fcac2e59ae4fb5b80 SHA1 92aa7970368c94922d1a0b08042340a8ab8c9da3 SHA256 8b089b02e57cf37a109173244a7d768e146cb5126e59ba289df842681c7f49b9
 EBUILD bonnie++-1.96.ebuild 887 RMD160 062f6e9ff3b400c50124c3585dde8600a2f56e5d SHA1 a1e5e1f2acbe628e16eb6a5b4273a91f5949a45b SHA256 a8e8bfb64357dc5aedc3fa891012a1e944b8d73170d0e2eb419f29aa2b23ece8
-MISC ChangeLog 5423 RMD160 46b6305c929b8c79e1c9f2dbcac5ae6fda0408e6 SHA1 eab2a46d66136f38d71fd3bb07728d447450113f SHA256 c9d9ac22a5fb6914b6255a2adcad5b3a0f4bea59cd58c4d7f7a51df4c9818b99
+MISC ChangeLog 5638 RMD160 5645d0944980d19d36861ccd5b31a2a3a0013523 SHA1 492385de3d2a99e51785f57ea17526546f6d3674 SHA256 8655e684cb00d9c314a5f4d99a8a38950d065755482cf003364003f954fd3fec
 MISC metadata.xml 412 RMD160 e3f3062f8e45abd287cd61463334aef3b439073b SHA1 b24c29f70c3176493d3e984da3103104fb4f732b SHA256 478db6e370e234a9358c710998da3ef80dc35e978f7ff18a9bccb6c0cc2f36d8
diff --git a/app-benchmarks/bonnie++/bonnie++-1.96-r1.ebuild b/app-benchmarks/bonnie++/bonnie++-1.96-r1.ebuild
new file mode 100644
index 000000000000..c6fe67baa183
--- /dev/null
+++ b/app-benchmarks/bonnie++/bonnie++-1.96-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bonnie++/bonnie++-1.96-r1.ebuild,v 1.1 2010/09/27 22:55:56 sping Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Hard drive bottleneck testing benchmark suite."
+HOMEPAGE="http://www.coker.com.au/bonnie++/"
+SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-compile-flags.patch
+}
+
+src_configure() {
+	econf \
+		$(use_with debug) \
+		--disable-stripping \
+		|| die
+}
+
+src_compile() {
+	emake || die "emake failed"
+	emake zcav || die "emake zcav failed" # see #9073
+}
+
+src_install() {
+	dosbin bonnie++ zcav || die
+	dobin bon_csv2html bon_csv2txt || die
+	doman bon_csv2html.1 bon_csv2txt.1 bonnie++.8 zcav.8
+	dohtml readme.html
+	dodoc changelog.txt credits.txt
+}
diff --git a/app-benchmarks/bonnie++/files/bonnie++-1.96-compile-flags.patch b/app-benchmarks/bonnie++/files/bonnie++-1.96-compile-flags.patch
new file mode 100644
index 000000000000..05821f977ecc
--- /dev/null
+++ b/app-benchmarks/bonnie++/files/bonnie++-1.96-compile-flags.patch
@@ -0,0 +1,17 @@
+diff --git a/Makefile.in b/Makefile.in
+index 4f14819..1092891 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -9,9 +9,9 @@ prefix=@prefix@
+ eprefix=@exec_prefix@
+ #MORE_WARNINGS=-Weffc++
+ WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wwrite-strings -pedantic -ffor-scope -Wcast-align -Wsign-compare -Wpointer-arith -Wwrite-strings -Wformat-security -Wswitch-enum -Winit-self $(MORE_WARNINGS)
+-CFLAGS=-O2 @debug@ -DNDEBUG $(WFLAGS) $(MORECFLAGS)
+-CXX=@CXX@ $(CFLAGS)
+-LINK=@CXX@
++CXXFLAGS += @debug@ -DNDEBUG $(WFLAGS)
++CXX=@CXX@ $(CXXFLAGS)
++LINK=@CXX@ $(LDFLAGS)
+ THREAD_LFLAGS=@thread_ldflags@
+ 
+ INSTALL=@INSTALL@