From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-938990-garchives=archives.gentoo.org@lists.gentoo.org>
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 61389139694
	for <garchives@archives.gentoo.org>; Thu, 16 Mar 2017 21:49:41 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 9066D21C088;
	Thu, 16 Mar 2017 21:49:40 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 5B3E921C088
	for <gentoo-commits@lists.gentoo.org>; Thu, 16 Mar 2017 21:49:40 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 292BB33BEFC
	for <gentoo-commits@lists.gentoo.org>; Thu, 16 Mar 2017 21:49:39 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id C20446A9F
	for <gentoo-commits@lists.gentoo.org>; Thu, 16 Mar 2017 21:49:37 +0000 (UTC)
From: "James Le Cuirot" <chewi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" <chewi@gentoo.org>
Message-ID: <1489700940.a79414398ba07ee1a776dafed0ebb86170fb4955.chewi@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/gcc5.patch app-benchmarks/i7z/i7z-93_p20131012.ebuild
X-VCS-Directories: app-benchmarks/i7z/files/ app-benchmarks/i7z/
X-VCS-Committer: chewi
X-VCS-Committer-Name: James Le Cuirot
X-VCS-Revision: a79414398ba07ee1a776dafed0ebb86170fb4955
X-VCS-Branch: master
Date: Thu, 16 Mar 2017 21:49:37 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: a757a31c-3864-4a22-b8ff-c4061a5461af
X-Archives-Hash: d884b2d9ff3c8ea2b965fd5c3424bec2

commit:     a79414398ba07ee1a776dafed0ebb86170fb4955
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 16 21:47:51 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 16 21:49:00 2017 +0000
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 <gcc-5.4?) but
angry_vincent provided the patch and it doesn't hurt to apply it.

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 app-benchmarks/i7z/files/gcc5.patch        | 40 ++++++++++++++++++++++++++++++
 app-benchmarks/i7z/i7z-93_p20131012.ebuild |  3 ++-
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/app-benchmarks/i7z/files/gcc5.patch b/app-benchmarks/i7z/files/gcc5.patch
new file mode 100644
index 00000000000..dd3ed99a1c7
--- /dev/null
+++ b/app-benchmarks/i7z/files/gcc5.patch
@@ -0,0 +1,40 @@
+diff -Nuar i7z-5023138d7c35c4667c938b853e5ea89737334e92/GUI/i7z_GUI.cpp 
+i7z-5023138d7c35c4667c938b853e5ea89737334e92-fixed/GUI/i7z_GUI.cpp
+--- i7z-5023138d7c35c4667c938b853e5ea89737334e92/GUI/i7z_GUI.cpp	2013-10-12 20:59:19.000000000 +0000
++++ i7z-5023138d7c35c4667c938b853e5ea89737334e92-fixed/GUI/i7z_GUI.cpp	2017-03-06 18:27:54.825756111 +0000
+@@ -16,7 +16,7 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <time.h>
+-#include <math.h>
++#include <cmath>
+ 
+ #include <QApplication>
+ #include <QPushButton>
+@@ -382,7 +382,7 @@
+ 
+             //C1_time[i] -= C3_time[i] + C6_time[i];
+ 			C1_time[i] = c1_time - (C3_time[i] + C6_time[i]) ;
+-            if (!isnan(c1_time) && !isinf(c1_time)) {
++            if (!std::isnan(c1_time) && !std::isinf(c1_time)) {
+                 if (C1_time[i] <= 0) {
+                     C1_time[i]=0;
+                 }
+@@ -642,13 +642,13 @@
+ 
+     for (i = 0; i < (int)numCPUs; i++)
+     {
+-        if ( (mythread->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}"