1 |
commit: 862d64a1f537638cf7bb9721b3323be331fe1cd3 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 1 02:46:24 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 1 23:11:45 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=862d64a1 |
7 |
|
8 |
app-benchmarks/bashmark: EAPI 7, respect CXX |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
app-benchmarks/bashmark/bashmark-0.6.2.ebuild | 23 +++++++++++++--------- |
13 |
.../bashmark/files/bashmark-0.6.2-as-needed.patch | 5 ++--- |
14 |
.../bashmark/files/bashmark-0.6.2-gcc43.patch | 15 ++++++-------- |
15 |
3 files changed, 22 insertions(+), 21 deletions(-) |
16 |
|
17 |
diff --git a/app-benchmarks/bashmark/bashmark-0.6.2.ebuild b/app-benchmarks/bashmark/bashmark-0.6.2.ebuild |
18 |
index c50dd20f033..6b8964a76be 100644 |
19 |
--- a/app-benchmarks/bashmark/bashmark-0.6.2.ebuild |
20 |
+++ b/app-benchmarks/bashmark/bashmark-0.6.2.ebuild |
21 |
@@ -1,23 +1,28 @@ |
22 |
-# Copyright 1999-2013 Gentoo Foundation |
23 |
+# Copyright 1999-2021 Gentoo Authors |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
|
26 |
-EAPI=5 |
27 |
+EAPI=7 |
28 |
|
29 |
-inherit eutils |
30 |
+inherit toolchain-funcs |
31 |
|
32 |
DESCRIPTION="Geno's cross platform benchmarking suite" |
33 |
HOMEPAGE="http://bashmark.coders-net.de" |
34 |
- |
35 |
SRC_URI="http://bashmark.coders-net.de/download/src/${P}.tar.bz2" |
36 |
+ |
37 |
LICENSE="GPL-2" |
38 |
SLOT="0" |
39 |
KEYWORDS="amd64 x86" |
40 |
-IUSE="" |
41 |
|
42 |
-src_prepare() { |
43 |
- epatch "${FILESDIR}"/${P}-as-needed.patch |
44 |
- epatch "${FILESDIR}"/${P}-gcc43.patch |
45 |
- epatch "${FILESDIR}"/${P}-gcc47.patch |
46 |
+PATCHES=( |
47 |
+ "${FILESDIR}"/${P}-as-needed.patch |
48 |
+ "${FILESDIR}"/${P}-gcc43.patch |
49 |
+ "${FILESDIR}"/${P}-gcc47.patch |
50 |
+) |
51 |
+ |
52 |
+src_configure() { |
53 |
+ tc-export CXX |
54 |
+ |
55 |
+ default |
56 |
} |
57 |
|
58 |
src_install() { |
59 |
|
60 |
diff --git a/app-benchmarks/bashmark/files/bashmark-0.6.2-as-needed.patch b/app-benchmarks/bashmark/files/bashmark-0.6.2-as-needed.patch |
61 |
index 6c01fd934e5..7af9843a9bc 100644 |
62 |
--- a/app-benchmarks/bashmark/files/bashmark-0.6.2-as-needed.patch |
63 |
+++ b/app-benchmarks/bashmark/files/bashmark-0.6.2-as-needed.patch |
64 |
@@ -1,6 +1,5 @@ |
65 |
-diff -ru bashmark-0.6.2-orig/makefile bashmark-0.6.2/makefile |
66 |
---- bashmark-0.6.2-orig/makefile 2007-10-08 23:01:06.000000000 +0300 |
67 |
-+++ bashmark-0.6.2/makefile 2007-10-08 23:01:22.000000000 +0300 |
68 |
+--- a/makefile |
69 |
++++ b/makefile |
70 |
@@ -10,7 +10,7 @@ |
71 |
BIN = bashmark |
72 |
|
73 |
|
74 |
diff --git a/app-benchmarks/bashmark/files/bashmark-0.6.2-gcc43.patch b/app-benchmarks/bashmark/files/bashmark-0.6.2-gcc43.patch |
75 |
index 625abdab397..02bded6c476 100644 |
76 |
--- a/app-benchmarks/bashmark/files/bashmark-0.6.2-gcc43.patch |
77 |
+++ b/app-benchmarks/bashmark/files/bashmark-0.6.2-gcc43.patch |
78 |
@@ -1,6 +1,5 @@ |
79 |
-diff -NrU5 bashmark-0.6.2.orig/Benchmark.cpp bashmark-0.6.2/Benchmark.cpp |
80 |
---- bashmark-0.6.2.orig/Benchmark.cpp 2008-06-29 11:53:07.000000000 +0200 |
81 |
-+++ bashmark-0.6.2/Benchmark.cpp 2008-06-29 11:54:02.000000000 +0200 |
82 |
+--- a/Benchmark.cpp |
83 |
++++ b/Benchmark.cpp |
84 |
@@ -15,11 +15,11 @@ |
85 |
* * |
86 |
* You should have received a copy of the GNU General Public License * |
87 |
@@ -14,9 +13,8 @@ diff -NrU5 bashmark-0.6.2.orig/Benchmark.cpp bashmark-0.6.2/Benchmark.cpp |
88 |
#include "Main.hpp" |
89 |
|
90 |
|
91 |
-diff -NrU5 bashmark-0.6.2.orig/main.cpp bashmark-0.6.2/main.cpp |
92 |
---- bashmark-0.6.2.orig/main.cpp 2008-06-29 11:53:07.000000000 +0200 |
93 |
-+++ bashmark-0.6.2/main.cpp 2008-06-29 11:56:40.000000000 +0200 |
94 |
+--- a/main.cpp |
95 |
++++ b/main.cpp |
96 |
@@ -17,10 +17,11 @@ |
97 |
* along with this software; if not, write to the Free Software * |
98 |
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * |
99 |
@@ -29,9 +27,8 @@ diff -NrU5 bashmark-0.6.2.orig/main.cpp bashmark-0.6.2/main.cpp |
100 |
|
101 |
#include "Output.hpp" |
102 |
#include "Sysinfo.hpp" |
103 |
-diff -NrU5 bashmark-0.6.2.orig/Sysinfo.cpp bashmark-0.6.2/Sysinfo.cpp |
104 |
---- bashmark-0.6.2.orig/Sysinfo.cpp 2008-06-29 11:53:07.000000000 +0200 |
105 |
-+++ bashmark-0.6.2/Sysinfo.cpp 2008-06-29 11:55:58.000000000 +0200 |
106 |
+--- a/Sysinfo.cpp |
107 |
++++ b/Sysinfo.cpp |
108 |
@@ -15,11 +15,12 @@ |
109 |
* * |
110 |
* You should have received a copy of the GNU General Public License * |