1 |
commit: 9eda907a2533811b443338bb02428561a5f9e5b5 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 31 11:39:00 2020 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 31 12:42:22 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eda907a |
7 |
|
8 |
app-benchmarks/i7z: Fix for gcc10 and some typos |
9 |
|
10 |
(from Debian) |
11 |
|
12 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
13 |
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> |
14 |
|
15 |
app-benchmarks/i7z/files/gcc-10.patch | 17 +++++++++++++++++ |
16 |
app-benchmarks/i7z/files/typos.patch | 25 +++++++++++++++++++++++++ |
17 |
app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild | 5 ++--- |
18 |
3 files changed, 44 insertions(+), 3 deletions(-) |
19 |
|
20 |
diff --git a/app-benchmarks/i7z/files/gcc-10.patch b/app-benchmarks/i7z/files/gcc-10.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..206b2c14340 |
23 |
--- /dev/null |
24 |
+++ b/app-benchmarks/i7z/files/gcc-10.patch |
25 |
@@ -0,0 +1,17 @@ |
26 |
+Author: Andreas Beckmann <anbe@××××××.org> |
27 |
+Description: fix FTBFS with gcc-10 |
28 |
+ gcc-10 defaults to -fno-common |
29 |
+ see https://gcc.gnu.org/gcc-10/porting_to.html |
30 |
+Bug-Debian: https://bugs.debian.org/957351 |
31 |
+ |
32 |
+--- a/i7z_Dual_Socket.c |
33 |
++++ b/i7z_Dual_Socket.c |
34 |
+@@ -37,7 +37,7 @@ float Read_Voltage_CPU(int cpu_num); |
35 |
+ extern struct program_options prog_options; |
36 |
+ FILE *fp_log_file; |
37 |
+ |
38 |
+-struct timespec global_ts; |
39 |
++extern struct timespec global_ts; |
40 |
+ extern FILE *fp_log_file_freq_1, *fp_log_file_freq_2; |
41 |
+ |
42 |
+ extern char* CPU_FREQUENCY_LOGGING_FILE_single; |
43 |
|
44 |
diff --git a/app-benchmarks/i7z/files/typos.patch b/app-benchmarks/i7z/files/typos.patch |
45 |
new file mode 100644 |
46 |
index 00000000000..9b1f3b95216 |
47 |
--- /dev/null |
48 |
+++ b/app-benchmarks/i7z/files/typos.patch |
49 |
@@ -0,0 +1,25 @@ |
50 |
+Author: Andreas Beckmann <anbe@××××××.org> |
51 |
+Description: fix typos found by Lintian |
52 |
+ |
53 |
+--- a/helper_functions.c |
54 |
++++ b/helper_functions.c |
55 |
+@@ -528,7 +528,7 @@ void Test_Or_Make_MSR_DEVICE_FILES() |
56 |
+ n=`expr $n + 1`; \ |
57 |
+ done; \ |
58 |
+ "); |
59 |
+- printf ("i7z DEBUG: modprobbing for msr\n"); |
60 |
++ printf ("i7z DEBUG: modprobing for msr\n"); |
61 |
+ system ("modprobe msr"); |
62 |
+ } else { |
63 |
+ printf ("i7z DEBUG: You DO NOT have root privileges, mknod to create device entries won't work out\n"); |
64 |
+--- a/perfmon-i7z/helper_functions.cpp |
65 |
++++ b/perfmon-i7z/helper_functions.cpp |
66 |
+@@ -484,7 +484,7 @@ void Test_Or_Make_MSR_DEVICE_FILES() |
67 |
+ n=`expr $n + 1`; \ |
68 |
+ done; \ |
69 |
+ "); |
70 |
+- printf ("i7z DEBUG: modprobbing for msr\n"); |
71 |
++ printf ("i7z DEBUG: modprobing for msr\n"); |
72 |
+ system ("modprobe msr"); |
73 |
+ } else { |
74 |
+ printf ("i7z DEBUG: You DONOT have root privileges, mknod to create device entries won't work out\n"); |
75 |
|
76 |
diff --git a/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild |
77 |
index 47b4c7b42ec..c2e8656b7af 100644 |
78 |
--- a/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild |
79 |
+++ b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild |
80 |
@@ -36,14 +36,13 @@ PATCHES=( |
81 |
"${FILESDIR}"/install-i7z_rw_registers.patch |
82 |
"${FILESDIR}"/use_stdbool.patch |
83 |
"${FILESDIR}"/nehalem.patch |
84 |
+ "${FILESDIR}"/gcc-10.patch |
85 |
+ "${FILESDIR}"/typos.patch |
86 |
) |
87 |
|
88 |
S="${WORKDIR}/${PN}-${COMMIT}" |
89 |
|
90 |
src_configure() { |
91 |
- # Workaround to build with gcc-10 until I find a patch |
92 |
- append-cflags -fcommon |
93 |
- |
94 |
tc-export CC PKG_CONFIG |
95 |
cd GUI || die |
96 |
use qt5 && eqmake5 ${PN}_GUI.pro |