summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2010-09-27 22:55:56 +0000
committerSebastian Pipping <sping@gentoo.org>2010-09-27 22:55:56 +0000
commit6b7ffb4e8dfdc32bd418b880ca8d9276d837b513 (patch)
tree3d4946808db4ea76143d71101e4a452e4a4bcc9b /app-benchmarks
parentAdd ~mips (diff)
downloadgentoo-2-6b7ffb4e8dfdc32bd418b880ca8d9276d837b513.tar.gz
gentoo-2-6b7ffb4e8dfdc32bd418b880ca8d9276d837b513.tar.bz2
gentoo-2-6b7ffb4e8dfdc32bd418b880ca8d9276d837b513.zip
app-benchmarks/bonnie++: Respect CFLAGS (bug #239951) and LDFLAGS (bug #337463)
(Portage version: 2.2_rc67_p185/cvs/Linux i686)
Diffstat (limited to 'app-benchmarks')
-rw-r--r--app-benchmarks/bonnie++/ChangeLog8
-rw-r--r--app-benchmarks/bonnie++/bonnie++-1.96-r1.ebuild43
-rw-r--r--app-benchmarks/bonnie++/files/bonnie++-1.96-compile-flags.patch17
3 files changed, 67 insertions, 1 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++/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@