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

[Pacho Ramos]

commit: 9eda907a2533811b443338bb02428561a5f9e5b5
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun May 31 11:39:00 2020 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun May 31 12:42:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eda907a

app-benchmarks/i7z: Fix for gcc10 and some typos

(from Debian)

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Pacho Ramos  gentoo.org>

 app-benchmarks/i7z/files/gcc-10.patch | 17 +
 app-benchmarks/i7z/files/typos.patch  | 25 +
 app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild |  5 ++---
 3 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/app-benchmarks/i7z/files/gcc-10.patch 
b/app-benchmarks/i7z/files/gcc-10.patch
new file mode 100644
index 000..206b2c14340
--- /dev/null
+++ b/app-benchmarks/i7z/files/gcc-10.patch
@@ -0,0 +1,17 @@
+Author: Andreas Beckmann 
+Description: fix FTBFS with gcc-10
+ gcc-10 defaults to -fno-common
+ see https://gcc.gnu.org/gcc-10/porting_to.html
+Bug-Debian: https://bugs.debian.org/957351
+
+--- a/i7z_Dual_Socket.c
 b/i7z_Dual_Socket.c
+@@ -37,7 +37,7 @@ float Read_Voltage_CPU(int cpu_num);
+ extern struct program_options prog_options;
+ FILE *fp_log_file;
+ 
+-struct timespec global_ts;
++extern struct timespec global_ts;
+ extern FILE *fp_log_file_freq_1, *fp_log_file_freq_2;
+ 
+ extern char* CPU_FREQUENCY_LOGGING_FILE_single;

diff --git a/app-benchmarks/i7z/files/typos.patch 
b/app-benchmarks/i7z/files/typos.patch
new file mode 100644
index 000..9b1f3b95216
--- /dev/null
+++ b/app-benchmarks/i7z/files/typos.patch
@@ -0,0 +1,25 @@
+Author: Andreas Beckmann 
+Description: fix typos found by Lintian
+
+--- a/helper_functions.c
 b/helper_functions.c
+@@ -528,7 +528,7 @@ void Test_Or_Make_MSR_DEVICE_FILES()
+   n=`expr $n + 
1`; \
+   done; \
+   ");
+-printf ("i7z DEBUG: modprobbing for msr\n");
++printf ("i7z DEBUG: modprobing for msr\n");
+ system ("modprobe msr");
+ } else {
+ printf ("i7z DEBUG: You DO NOT have root privileges, mknod to 
create device entries won't work out\n");
+--- a/perfmon-i7z/helper_functions.cpp
 b/perfmon-i7z/helper_functions.cpp
+@@ -484,7 +484,7 @@ void Test_Or_Make_MSR_DEVICE_FILES()
+   n=`expr $n + 
1`; \
+   done; \
+   ");
+-printf ("i7z DEBUG: modprobbing for msr\n");
++printf ("i7z DEBUG: modprobing for msr\n");
+ system ("modprobe msr");
+ } else {
+ printf ("i7z DEBUG: You DONOT have root privileges, mknod to 
create device entries won't work out\n");

diff --git a/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild 
b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
index 47b4c7b42ec..c2e8656b7af 100644
--- a/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
+++ b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
@@ -36,14 +36,13 @@ PATCHES=(
"${FILESDIR}"/install-i7z_rw_registers.patch
"${FILESDIR}"/use_stdbool.patch
"${FILESDIR}"/nehalem.patch
+   "${FILESDIR}"/gcc-10.patch
+   "${FILESDIR}"/typos.patch
 )
 
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 src_configure() {
-   # Workaround to build with gcc-10 until I find a patch
-   append-cflags -fcommon
-
tc-export CC PKG_CONFIG
cd GUI || die
use qt5 && eqmake5 ${PN}_GUI.pro

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

[James Le Cuirot]

commit: a79414398ba07ee1a776dafed0ebb86170fb4955
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Mar 16 21:47:51 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Mar 16 21:49:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7941439

app-benchmarks/i7z: Fix building GUI with GCC 5 (Funtoo bug FL-3617)

I wasn't able to reproduce this (possibly affects FREQ[i] > Max_Freq_socket0) && 
(!isnan(mythread->FREQ[i])) &&
+-(!isinf(mythread->FREQ[i]))  && (socket_list[i] == 
socket_0.socket_num) ) {
++if ( (mythread->FREQ[i] > Max_Freq_socket0) && 
(!std::isnan(mythread->FREQ[i])) &&
++(!std::isinf(mythread->FREQ[i]))  && (socket_list[i] == 
socket_0.socket_num) ) {
+ Max_Freq_socket0 = mythread->FREQ[i];
+ num_socket0_cpus++;
+ }
+-if ( (mythread->FREQ[i] > Max_Freq_socket1) && 
(!isnan(mythread->FREQ[i])) &&
+-(!isinf(mythread->FREQ[i]))  && (socket_list[i] == 
socket_1.socket_num) ) {
++if ( (mythread->FREQ[i] > Max_Freq_socket1) && 
(!std::isnan(mythread->FREQ[i])) &&
++(!std::isinf(mythread->FREQ[i]))  && (socket_list[i] == 
socket_1.socket_num) ) {
+ Max_Freq_socket1 = mythread->FREQ[i];
+ num_socket1_cpus++;
+ }

diff --git a/app-benchmarks/i7z/i7z-93_p20131012.ebuild 
b/app-benchmarks/i7z/i7z-93_p20131012.ebuild
index f5ae2dfa5ac..e8ec6d12e91 100644
--- a/app-benchmarks/i7z/i7z-93_p20131012.ebuild
+++ b/app-benchmarks/i7z/i7z-93_p20131012.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
"${FILESDIR}"/i7z-0.27.2-ncurses.patch
"${FILESDIR}"/qt5.patch
+   "${FILESDIR}"/gcc5.patch
 )
 
 S="${WORKDIR}/${PN}-${COMMIT}"