diff options
| author |   Danny van Dyk <kugelfang@gentoo.org> | 2004-09-15 00:52:00 +0000 |
|---|---|---|
| committer | Danny van Dyk <kugelfang@gentoo.org> | 2004-09-15 00:52:00 +0000 |
| commit | f074ffac70b919752dba19af365cb046151d0862 (patch) | |
| tree | caee34ce106cec7cc82415e21b7802357868055a | |
| parent | Stable on sparc wrt security bug #61412. (Manifest recommit) (diff) | |
| download | gentoo-2-f074ffac70b919752dba19af365cb046151d0862.tar.gz gentoo-2-f074ffac70b919752dba19af365cb046151d0862.tar.bz2 gentoo-2-f074ffac70b919752dba19af365cb046151d0862.zip | |
Fixed BUG #63808. Stable on amd64.
| -rw-r--r-- | app-benchmarks/bonnie++/ChangeLog | 6 | ||||
| -rw-r--r-- | app-benchmarks/bonnie++/bonnie++-1.93c.ebuild | 12 | ||||
| -rw-r--r-- | app-benchmarks/bonnie++/files/bonnie++-1.93c-64bit.patch | 15 |
3 files changed, 30 insertions, 3 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++/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"); |