[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/bonnie/, app-benchmarks/bonnie/files/

[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/bonnie/, app-benchmarks/bonnie/files/

[David Seifert]

commit:     2eb3a8d3ec499cd3c4152856b57c6c7ad1437295
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 12:45:46 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 12:49:47 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eb3a8d3

app-benchmarks/bonnie: [QA] Minor touchups

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild | 14 ++++++++------
 app-benchmarks/bonnie/files/Makefile.patch   |  9 ++++-----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild b/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild
index c9fdf5a2ddb..65ce1c40e0e 100644
--- a/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild
+++ b/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Performance Test of Filesystem I/O using standard C library calls"
 HOMEPAGE="http://www.textuality.com/bonnie/"
@@ -16,12 +16,14 @@ IUSE=""
 
 S=${WORKDIR}
 
-PATCHES=( "${FILESDIR}/bonnie_man.patch"
-	  "${FILESDIR}/Makefile.patch"
-	  "${FILESDIR}/${P}-includes.patch" )
+PATCHES=(
+	"${FILESDIR}"/bonnie_man.patch
+	"${FILESDIR}"/Makefile.patch
+	"${FILESDIR}"/${P}-includes.patch
+)
 
-src_compile() {
-	emake CC=$(tc-getCC) SYSFLAGS="${CFLAGS}"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {

diff --git a/app-benchmarks/bonnie/files/Makefile.patch b/app-benchmarks/bonnie/files/Makefile.patch
index c4367087b8b..d803bd077ce 100644
--- a/app-benchmarks/bonnie/files/Makefile.patch
+++ b/app-benchmarks/bonnie/files/Makefile.patch
@@ -1,9 +1,8 @@
---- a/Makefile	1996-08-29 03:45:37.000000000 +0200
-+++ b/Makefile	2011-08-25 16:07:10.757629898 +0200
-@@ -1,11 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,11 +1,9 @@
 -CFLAGS = -O $(SYSFLAGS)
-+CFLAGS = $(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."'

[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/bonnie/, app-benchmarks/bonnie/files/

[Ionen Wolkens]

commit:     c4dbd767a4c65c6a1d1abd0c1f11151dd8e96e1c
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 29 00:11:29 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 04:17:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4dbd767

app-benchmarks/bonnie: fix build with clang16

Very trivial.

Closes: https://bugs.gentoo.org/870559
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 app-benchmarks/bonnie/bonnie-2.0.6-r3.ebuild           | 1 +
 app-benchmarks/bonnie/files/bonnie-2.0.6-clang16.patch | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/app-benchmarks/bonnie/bonnie-2.0.6-r3.ebuild b/app-benchmarks/bonnie/bonnie-2.0.6-r3.ebuild
index 6627f2b54a47..2ab46e265b61 100644
--- a/app-benchmarks/bonnie/bonnie-2.0.6-r3.ebuild
+++ b/app-benchmarks/bonnie/bonnie-2.0.6-r3.ebuild
@@ -17,6 +17,7 @@ KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86"
 PATCHES=(
 	"${FILESDIR}"/${P}-includes.patch
 	"${FILESDIR}"/${P}-man.patch
+	"${FILESDIR}"/${P}-clang16.patch
 )
 
 src_compile() {

diff --git a/app-benchmarks/bonnie/files/bonnie-2.0.6-clang16.patch b/app-benchmarks/bonnie/files/bonnie-2.0.6-clang16.patch
new file mode 100644
index 000000000000..d1a3a36fa4f2
--- /dev/null
+++ b/app-benchmarks/bonnie/files/bonnie-2.0.6-clang16.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/870559
+--- a/Bonnie.c
++++ b/Bonnie.c
+@@ -93,3 +93,3 @@
+ 
+-main(
++int main(
+   int    argc,