If USE=pgo tuning fails, ignore the results rather than aborting the build #456346 by Justin Lecher.

(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

4 files changed, 30 insertions, 16 deletions

diff --git a/dev-libs/gmp/ChangeLog b/dev-libs/gmp/ChangeLog
index 9f86b7e3a3df..90f0b162c5d0 100644
--- a/dev-libs/gmp/ChangeLog
+++ b/dev-libs/gmp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/gmp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.177 2013/05/21 18:48:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.178 2013/05/26 16:14:48 vapier Exp $
+
+  26 May 2013; Mike Frysinger <vapier@gentoo.org> gmp-5.1.0.ebuild,
+  gmp-5.1.1.ebuild, gmp-5.1.2.ebuild:
+  If USE=pgo tuning fails, ignore the results rather than aborting the build
+  #456346 by Justin Lecher.
 
 *gmp-5.1.2 (21 May 2013)
 
diff --git a/dev-libs/gmp/gmp-5.1.0.ebuild b/dev-libs/gmp/gmp-5.1.0.ebuild
index 79705b0eed1c..53bd77e77868 100644
--- a/dev-libs/gmp/gmp-5.1.0.ebuild
+++ b/dev-libs/gmp/gmp-5.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.1.0.ebuild,v 1.6 2013/04/21 02:21:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.1.0.ebuild,v 1.7 2013/05/26 16:14:48 vapier Exp $
 
 inherit flag-o-matic eutils libtool unpacker toolchain-funcs
 
@@ -75,10 +75,13 @@ src_compile() {
 
 	if use pgo ; then
 		emake -j1 -C tune tuneup || die
-		rm gmp-mparam.h || die
-		./tune/tuneup | tee gmp-mparam.h
-		emake clean || die
-		emake || die
+		ebegin "Trying to generate tuned data"
+		./tune/tuneup | tee gmp.mparam.h.new
+		if eend $(( 0 + ${PIPESTATUS[*]/#/+} )) ; then
+			mv gmp-mparam.h.new gmp-mparam.h
+			emake clean || die
+			emake || die
+		fi
 	fi
 }
 
diff --git a/dev-libs/gmp/gmp-5.1.1.ebuild b/dev-libs/gmp/gmp-5.1.1.ebuild
index 25e03b2bf9d7..9d6fcdd74c7a 100644
--- a/dev-libs/gmp/gmp-5.1.1.ebuild
+++ b/dev-libs/gmp/gmp-5.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.1.1.ebuild,v 1.2 2013/04/21 02:21:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.1.1.ebuild,v 1.3 2013/05/26 16:14:48 vapier Exp $
 
 inherit flag-o-matic eutils libtool unpacker toolchain-funcs
 
@@ -74,10 +74,13 @@ src_compile() {
 
 	if use pgo ; then
 		emake -j1 -C tune tuneup || die
-		rm gmp-mparam.h || die
-		./tune/tuneup | tee gmp-mparam.h
-		emake clean || die
-		emake || die
+		ebegin "Trying to generate tuned data"
+		./tune/tuneup | tee gmp.mparam.h.new
+		if eend $(( 0 + ${PIPESTATUS[*]/#/+} )) ; then
+			mv gmp-mparam.h.new gmp-mparam.h
+			emake clean || die
+			emake || die
+		fi
 	fi
 }
 
diff --git a/dev-libs/gmp/gmp-5.1.2.ebuild b/dev-libs/gmp/gmp-5.1.2.ebuild
index 2aa5764c3fc8..baa4a6d20bc3 100644
--- a/dev-libs/gmp/gmp-5.1.2.ebuild
+++ b/dev-libs/gmp/gmp-5.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.1.2.ebuild,v 1.1 2013/05/21 18:48:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.1.2.ebuild,v 1.2 2013/05/26 16:14:48 vapier Exp $
 
 inherit flag-o-matic eutils libtool unpacker toolchain-funcs
 
@@ -73,10 +73,13 @@ src_compile() {
 
 	if use pgo ; then
 		emake -j1 -C tune tuneup || die
-		rm gmp-mparam.h || die
-		./tune/tuneup | tee gmp-mparam.h
-		emake clean || die
-		emake || die
+		ebegin "Trying to generate tuned data"
+		./tune/tuneup | tee gmp.mparam.h.new
+		if eend $(( 0 + ${PIPESTATUS[*]/#/+} )) ; then
+			mv gmp-mparam.h.new gmp-mparam.h
+			emake clean || die
+			emake || die
+		fi
 	fi
 }