[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/bonnie/files/, app-benchmarks/bonnie/
commit: 0ab1846b289cd3a7c35cb206a5ae80609bf8ede0
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Sep 28 23:53:18 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Sep 29 04:17:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ab1846b
app-benchmarks/bonnie: EAPI6->8, use https, tidy patches
Also drop the Makefile patch, no reason to even use the Makefile.
Signed-off-by: Ionen Wolkens gentoo.org>
...{bonnie-2.0.6-r2.ebuild => bonnie-2.0.6-r3.ebuild} | 19 +--
app-benchmarks/bonnie/files/Makefile.patch| 16
.../bonnie/files/bonnie-2.0.6-includes.patch | 10 +++---
app-benchmarks/bonnie/files/bonnie-2.0.6-man.patch| 8
app-benchmarks/bonnie/files/bonnie_man.patch | 16
5 files changed, 20 insertions(+), 49 deletions(-)
diff --git a/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild
b/app-benchmarks/bonnie/bonnie-2.0.6-r3.ebuild
similarity index 60%
rename from app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild
rename to app-benchmarks/bonnie/bonnie-2.0.6-r3.ebuild
index 9c683b9e65ac..6627f2b54a47 100644
--- a/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild
+++ b/app-benchmarks/bonnie/bonnie-2.0.6-r3.ebuild
@@ -1,29 +1,28 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit toolchain-funcs
DESCRIPTION="Performance Test of Filesystem I/O using standard C library calls"
-HOMEPAGE="http://www.textuality.com/bonnie/;
-SRC_URI="http://www.textuality.com/bonnie/bonnie.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://www.textuality.com/bonnie/;
+SRC_URI="https://www.textuality.com/bonnie/bonnie.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"
LICENSE="bonnie"
SLOT="0"
KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-S=${WORKDIR}
PATCHES=(
- "${FILESDIR}"/bonnie_man.patch
- "${FILESDIR}"/Makefile.patch
"${FILESDIR}"/${P}-includes.patch
+ "${FILESDIR}"/${P}-man.patch
)
-src_configure() {
+src_compile() {
tc-export CC
+
+ emake -f /dev/null Bonnie
}
src_install() {
diff --git a/app-benchmarks/bonnie/files/Makefile.patch
b/app-benchmarks/bonnie/files/Makefile.patch
deleted file mode 100644
index d803bd077ced..
--- a/app-benchmarks/bonnie/files/Makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
a/Makefile
-+++ b/Makefile
-@@ -1,11 +1,9 @@
--CFLAGS = -O $(SYSFLAGS)
--
- bsd:
- @echo 'Options are "make bsd" and "make SysV" - the default is "bsd".'
- @echo 'If you get messages about missing functions, try "make SysV."'
-- make Bonnie
-+ $(MAKE) Bonnie
-
- SysV:
-- make Bonnie 'SYSFLAGS=-DSysV'
-+ $(MAKE) Bonnie 'SYSFLAGS=-DSysV'
-
- Bonnie:
diff --git a/app-benchmarks/bonnie/files/bonnie-2.0.6-includes.patch
b/app-benchmarks/bonnie/files/bonnie-2.0.6-includes.patch
index cfefe953c6f1..8bec1e2ab04d 100644
--- a/app-benchmarks/bonnie/files/bonnie-2.0.6-includes.patch
+++ b/app-benchmarks/bonnie/files/bonnie-2.0.6-includes.patch
@@ -1,13 +1,9 @@
a/Bonnie.c 1996-08-28 18:23:49.0 +0200
-+++ b/Bonnie.c 2010-10-12 20:15:26.0 +0200
-@@ -29,6 +29,10 @@
- #include
- #include
+--- a/Bonnie.c
b/Bonnie.c
+@@ -31,2 +31,6 @@
#include
+#include
+#include
+#include
+#include
#if defined(SysV)
- #include
- #include
diff --git a/app-benchmarks/bonnie/files/bonnie-2.0.6-man.patch
b/app-benchmarks/bonnie/files/bonnie-2.0.6-man.patch
new file mode 100644
index ..d492ebd7c922
--- /dev/null
+++ b/app-benchmarks/bonnie/files/bonnie-2.0.6-man.patch
@@ -0,0 +1,8 @@
+--- a/bonnie.1
b/bonnie.1
+@@ -63 +63 @@
+-.TH Bonnie 1 "2.0.6" Textuality
++.TH bonnie 1 "2.0.6" Textuality
+@@ -67 +67 @@
+-.B Bonnie
++.B bonnie
diff --git a/app-benchmarks/bonnie/files/bonnie_man.patch
b/app-benchmarks/bonnie/files/bonnie_man.patch
deleted file mode 100644
index e4b2fe0a12e3..
--- a/app-benchmarks/bonnie/files/bonnie_man.patch
+++ /dev/null
@@ -1,16 +0,0 @@
a/bonnie.1 2003-01-07 14:19:29.0 -0600
-+++ b/bonnie.1 2003-01-07 14:20:19.0 -0600
-@@ -60,11 +60,11 @@
- .fi
- .in
- ..
--.TH Bonnie 1 "2.0.6" Textuality
-+.TH bonnie 1 "2.0.6" Textuality
- .SH NAME
- Bonnie - File system benchmark
- .SH "SYNOPSIS"
--.B Bonnie
-+.B bonnie
- .RI "[-d\ scratch-dir]"
- .RI "[-html]"
- .RI "[-m\ machine-label]"
[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/bonnie/files/, app-benchmarks/bonnie/
commit: a441b9ac50933b6a4f736995092d53a8c268b707
Author: Amy Liffey gentoo org>
AuthorDate: Tue Aug 8 09:08:40 2017 +
Commit: Amy Liffey gentoo org>
CommitDate: Tue Aug 8 09:08:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a441b9ac
app-benchmarks/bonnie: EAPI 6 bump
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild | 31
app-benchmarks/bonnie/files/bonnie_man.patch | 4 ++--
2 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild
b/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild
new file mode 100644
index 000..c9fdf5a2ddb
--- /dev/null
+++ b/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Performance Test of Filesystem I/O using standard C library calls"
+HOMEPAGE="http://www.textuality.com/bonnie/;
+SRC_URI="http://www.textuality.com/bonnie/bonnie.tar.gz;
+
+LICENSE="bonnie"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+S=${WORKDIR}
+
+PATCHES=( "${FILESDIR}/bonnie_man.patch"
+ "${FILESDIR}/Makefile.patch"
+ "${FILESDIR}/${P}-includes.patch" )
+
+src_compile() {
+ emake CC=$(tc-getCC) SYSFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ newbin Bonnie bonnie
+ doman bonnie.1
+ dodoc Instructions
+}
diff --git a/app-benchmarks/bonnie/files/bonnie_man.patch
b/app-benchmarks/bonnie/files/bonnie_man.patch
index 63dac33159a..e4b2fe0a12e 100644
--- a/app-benchmarks/bonnie/files/bonnie_man.patch
+++ b/app-benchmarks/bonnie/files/bonnie_man.patch
@@ -1,5 +1,5 @@
bonnie.1.orig 2003-01-07 14:19:29.0 -0600
-+++ bonnie.1 2003-01-07 14:20:19.0 -0600
+--- a/bonnie.1 2003-01-07 14:19:29.0 -0600
b/bonnie.1 2003-01-07 14:20:19.0 -0600
@@ -60,11 +60,11 @@
.fi
.in
[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/bonnie++/files/, app-benchmarks/bonnie++/
commit: 8592f9336cde604750ae27431a2d172d3dfe6ab0
Author: Göktürk Yüksek binghamton edu>
AuthorDate: Sat Feb 13 03:51:15 2016 +
Commit: Patrice Clement gentoo org>
CommitDate: Tue Feb 16 09:23:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8592f933
app-benchmarks/bonnie++: eapi bump, fix #309319, #431684, #515334
Also get rid if unnecessary DEPEND and RDEPEND since this package
has no external dependencies.
Remove src_compile phase that was added per #9073 14 years ago.
It's not reproducible anymore.
The 'changelog.txt' file is a symlink to 'debian/changelog'. Install
the actual changelog instead of the symlink.
Install everything under bin/ as opposed to sbin/ since this is
not a system application.
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=9073
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=309319
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=431684
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=515334
Package-Manager: portage-2.2.26
app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild| 39 ++
.../bonnie++-1.97-zcav-array-indexing-fix.patch| 35 +++
2 files changed, 74 insertions(+)
diff --git a/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild
b/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild
new file mode 100644
index 000..bfb5436
--- /dev/null
+++ b/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+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 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+S="${WORKDIR}/${P}.1"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.96-compile-flags.patch" #426788
+ "${FILESDIR}"/${P}-zcav-array-indexing-fix.patch #309319
+)
+
+DOCS=( README.txt README-2.00 debian/changelog credits.txt )
+HTML_DOCS=( readme.html )
+
+src_configure() {
+ econf \
+ $(usex debug "--enable-debug" "") \
+ --disable-stripping
+}
+
+src_install() {
+ dobin bonnie++ zcav bon_csv2html bon_csv2txt
+ sed -i -e \
+
"s:/usr/share/doc/bonnie++:${EPREFIX}/usr/share/doc/${PF}/html:g" \
+ bonnie++.8 || die #431684
+ doman bon_csv2html.1 bon_csv2txt.1 bonnie++.8 zcav.8
+ einstalldocs
+}
diff --git
a/app-benchmarks/bonnie++/files/bonnie++-1.97-zcav-array-indexing-fix.patch
b/app-benchmarks/bonnie++/files/bonnie++-1.97-zcav-array-indexing-fix.patch
new file mode 100644
index 000..3d92689
--- /dev/null
+++ b/app-benchmarks/bonnie++/files/bonnie++-1.97-zcav-array-indexing-fix.patch
@@ -0,0 +1,35 @@
+From: Göktürk Yüksek
+Subject: [PATCH] Fix array indexing in Zcav::Read when max_loop > 1 and
start_offset > 0
+
+In method Zcav::Read, the variable 'i' holds the block index. It is
+also used as an index to arrays of measurement values (read times and
+block counts) when (max_loops > 0). However, the blocks array and
+measurements arrays will be out of sync if some initial blocks are to
+be skipped (by having start_offset > 0). Using the same index value
+for arrays of different sizes causes segfaults. Fix it by substracting
+the start_offset properly when accessing the measurements arrays.
+
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=309319
+
+--- a/zcav_io.cpp
b/zcav_io.cpp
+@@ -108,7 +108,7 @@
+ double total_read_time = 0.0;
+ bool nextLoop = false;
+ for( ; !nextLoop && (!max_size || i < max_size)
+- && (loops == 0 || (m_times[i] && m_times[i][0] != -1.0))
++ && (loops == 0 || (m_times[i - start_offset] && m_times[i -
start_offset][0] != -1.0))
+ && (!max_size || i < max_size); i++)
+ {
+ double read_time = access_data(i ? skip_rate - 1 : 0);
+@@ -135,8 +135,8 @@
+ m_times.push_back(new double[max_loops]);
+ m_count.push_back(0);
+ }
+-m_times[i][loops] = read_time;
+-m_count[i]++;
++m_times[i - start_offset][loops] = read_time;
++m_count[i - start_offset]++;
+ }
+ } // end loop for reading blocks
+
