summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny van Dyk <kugelfang@gentoo.org>2004-09-15 00:52:00 +0000
committerDanny van Dyk <kugelfang@gentoo.org>2004-09-15 00:52:00 +0000
commitc665e10077dbc027347c5c2d43ae9f38143849a4 (patch)
treebf0763e586f1f323cf9dfddc8e18433c766404a4 /app-benchmarks
parentStable on sparc wrt security bug #61412. (diff)
downloadhistorical-c665e10077dbc027347c5c2d43ae9f38143849a4.tar.gz
historical-c665e10077dbc027347c5c2d43ae9f38143849a4.tar.bz2
historical-c665e10077dbc027347c5c2d43ae9f38143849a4.zip
Fixed BUG #63808. Stable on amd64.
Diffstat (limited to 'app-benchmarks')
-rw-r--r--app-benchmarks/bonnie++/ChangeLog6
-rw-r--r--app-benchmarks/bonnie++/Manifest7
-rw-r--r--app-benchmarks/bonnie++/bonnie++-1.93c.ebuild12
-rw-r--r--app-benchmarks/bonnie++/files/bonnie++-1.93c-64bit.patch15
4 files changed, 34 insertions, 6 deletions
diff --git a/app-benchmarks/bonnie++/ChangeLog b/app-benchmarks/bonnie++/ChangeLog
index d11864d3e3a0..b74fd21aac87 100644
--- a/app-benchmarks/bonnie++/ChangeLog
+++ b/app-benchmarks/bonnie++/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-benchmarks/bonnie++
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bonnie++/ChangeLog,v 1.9 2004/08/27 18:19:58 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bonnie++/ChangeLog,v 1.10 2004/09/15 00:52:00 kugelfang Exp $
+
+ 15 Sep 2004; Danny van Dyk <kugelfang@gentoo.org>
+ +files/bonnie++-1.93c-64bit.patch, bonnie++-1.93c.ebuild:
+ Added patch to make bonnie++ compile on 64bit systems. Fixes BUG #63808.
27 Aug 2004; Daniel Goller <morfic@gentoo.org> bonnie++-1.93c.ebuild:
Going gold on x86
diff --git a/app-benchmarks/bonnie++/Manifest b/app-benchmarks/bonnie++/Manifest
index 1580210c52d1..17068b1f36e1 100644
--- a/app-benchmarks/bonnie++/Manifest
+++ b/app-benchmarks/bonnie++/Manifest
@@ -1,8 +1,9 @@
+MD5 21bdc81ccf23a72cdca43ece860d8945 ChangeLog 2491
MD5 a58f7fbae7418de9bf3236a95c718f86 bonnie++-1.02c-r1.ebuild 897
-MD5 2f5097f1dc81e88a73cbea6043d53edf bonnie++-1.93c.ebuild 867
MD5 0cacd26108c279350b9739ddf5679a4a bonnie++-1.03.ebuild 853
-MD5 d893c727a7c5727494426223bbd402e4 ChangeLog 2299
+MD5 3a9ba7afb6a764c6c8ffbac06ba242c3 bonnie++-1.93c.ebuild 979
MD5 aeb5a6b55ca2477b1f998c03e6c42a15 metadata.xml 493
-MD5 f7a1f45cf334317f5cbafa8ac9cea78a files/digest-bonnie++-1.03 61
MD5 0c790252377cc712ba5b9d715e4fa9b7 files/digest-bonnie++-1.02c-r1 62
+MD5 f7a1f45cf334317f5cbafa8ac9cea78a files/digest-bonnie++-1.03 61
MD5 52da670893e9dbaa752cd942a3e37eb2 files/digest-bonnie++-1.93c 63
+MD5 e1523060054e41baed39c972d27731f3 files/bonnie++-1.93c-64bit.patch 646
diff --git a/app-benchmarks/bonnie++/bonnie++-1.93c.ebuild b/app-benchmarks/bonnie++/bonnie++-1.93c.ebuild
index 10b008d18208..0fef63447656 100644
--- a/app-benchmarks/bonnie++/bonnie++-1.93c.ebuild
+++ b/app-benchmarks/bonnie++/bonnie++-1.93c.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bonnie++/bonnie++-1.93c.ebuild,v 1.2 2004/08/27 18:19:58 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bonnie++/bonnie++-1.93c.ebuild,v 1.3 2004/09/15 00:52:00 kugelfang Exp $
+
+inherit eutils 64-bit
DESCRIPTION="Hard drive bottleneck testing benchmark suite."
HOMEPAGE="http://www.coker.com.au/bonnie++/"
@@ -8,11 +10,17 @@ SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc alpha ~amd64"
+KEYWORDS="x86 ~ppc ~sparc alpha amd64"
IUSE="debug"
DEPEND="virtual/libc"
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ 64-bit && epatch ${FILESDIR}/${P}-64bit.patch
+}
+
src_compile() {
econf \
`use_with debug` \
diff --git a/app-benchmarks/bonnie++/files/bonnie++-1.93c-64bit.patch b/app-benchmarks/bonnie++/files/bonnie++-1.93c-64bit.patch
new file mode 100644
index 000000000000..2af76d8f8c80
--- /dev/null
+++ b/app-benchmarks/bonnie++/files/bonnie++-1.93c-64bit.patch
@@ -0,0 +1,15 @@
+--- getc_putc.cpp.old 2004-09-15 02:37:21.500489552 +0200
++++ getc_putc.cpp 2004-09-15 02:40:58.623481840 +0200
+@@ -165,7 +165,11 @@
+ int size = 0, wrote;
+ while(size < file_size)
+ {
+- wrote = write(FILE_FD, buf, min(sizeof(buf), (unsigned int)file_size - size));
++ //wrote = write(FILE_FD, buf, min(sizeof(buf), (unsigned int)file_size - size));
++ /*
++ * gcc doesn't like above line. ? : should do the job as good as min()...
++ */
++ wrote = write(FILE_FD, buf, (sizeof(buf) < (file_size - size) ? (sizeof(buf)):(file_size - size)));
+ if(wrote < 0)
+ {
+ fprintf(stderr, "Can't extend file - disk full?\n");