From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 99BE61382C5 for ; Sun, 31 May 2020 12:42:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D3C4EE091F; Sun, 31 May 2020 12:42:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B2098E091F for ; Sun, 31 May 2020 12:42:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 562F534F025 for ; Sun, 31 May 2020 12:42:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 37F73279 for ; Sun, 31 May 2020 12:42:40 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1590928942.9eda907a2533811b443338bb02428561a5f9e5b5.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/i7z/files/, app-benchmarks/i7z/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-benchmarks/i7z/files/gcc-10.patch app-benchmarks/i7z/files/typos.patch app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild X-VCS-Directories: app-benchmarks/i7z/ app-benchmarks/i7z/files/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 9eda907a2533811b443338bb02428561a5f9e5b5 X-VCS-Branch: master Date: Sun, 31 May 2020 12:42:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8dcb1b71-67dc-4609-abe8-4774f3621744 X-Archives-Hash: fd74f4043b61cbff6632fdd79d41f12b commit: 9eda907a2533811b443338bb02428561a5f9e5b5 Author: Pacho Ramos gentoo org> AuthorDate: Sun May 31 11:39:00 2020 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Sun May 31 12:42:22 2020 +0000 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 00000000000..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 00000000000..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