gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
(from Debian)

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Pacho Ramos <pacho@gentoo.org>
This commit is contained in:
Pacho Ramos
2020-05-31 13:39:00 +02:00
parent d98e07d295
commit 9eda907a25
3 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app-benchmarks/i7z/files/gcc-10.patch Normal file
View File

@@ -0,0 +1,17 @@
Author: Andreas Beckmann <anbe@debian.org>
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;

25
app-benchmarks/i7z/files/typos.patch Normal file
View File

@@ -0,0 +1,25 @@
Author: Andreas Beckmann <anbe@debian.org>
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");

5
app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
View File

@@ -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