From c02596c2f1c3384b5ef4771ef67ec5c7b8f5672f Mon Sep 17 00:00:00 2001
From: miqlas <5569059+extrowerk@users.noreply.github.com>
Date: Sun, 23 Dec 2018 13:22:16 +0100
Subject: [PATCH] OpenBLAS: use the same parameters for install and test
 (#3494)

---
 sci-libs/openblas/openblas-0.3.4.recipe | 48 +++++++++++++++++--------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/sci-libs/openblas/openblas-0.3.4.recipe b/sci-libs/openblas/openblas-0.3.4.recipe
index 9ba3b60a6..2564eb41d 100644
--- a/sci-libs/openblas/openblas-0.3.4.recipe
+++ b/sci-libs/openblas/openblas-0.3.4.recipe
@@ -4,7 +4,7 @@ version."
 HOMEPAGE="http://www.openblas.net/"
 COPYRIGHT="2011-2018 The OpenBLAS Project"
 LICENSE="BSD (3-clause)"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://github.com/xianyi/OpenBLAS/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="4b4b4453251e9edb5f57465bf2b3cf67b19d811d50c8588cdf2ea1f201bb834f"
 SOURCE_FILENAME="OpenBLAS-$portVersion.tar.gz"
@@ -53,25 +53,38 @@ defineDebugInfoPackage openblas$secondaryArchSuffix \
 	"$libDir"/libopenblas.so.0 \
 	"$libDir"/libopenblasp-r$portVersion.so
 
+# DYNAMIC_ARCH is x86 only
+# PPC & others should specify TARGET=
+case "$effectiveTargetArchitecture" in
+	x86) target=NORTHWOOD;;
+	x86_64) target=PRESCOTT;;
+	*) target=;;
+esac
+
 BUILD()
 {
-	# DYNAMIC_ARCH is x86 only
-	# PPC & others should specify TARGET=
-	case "$effectiveTargetArchitecture" in
-		x86) target=NORTHWOOD;;
-		x86_64) target=PRESCOTT;;
-		*) target=;;
-	esac
-
-	make MAKE_NB_JOBS=${jobArgs#-j} NO_LAPACKE=1 NO_AFFINITY=1 NO_WARMUP=1 \
-		NUM_THREADS=64 DYNAMIC_ARCH=1 USE_OPENMP=1 ${target:+TARGET=$target}
+	make MAKE_NB_JOBS=${jobArgs#-j} \
+		NO_LAPACKE=1 \
+		NO_AFFINITY=1 \
+		NO_WARMUP=1 \
+		NUM_THREADS=64 \
+		DYNAMIC_ARCH=1 \
+		USE_OPENMP=1 \
+		${target:+TARGET=$target}
 }
 
 INSTALL()
 {
 	make install PREFIX=$prefix \
-		 OPENBLAS_LIBRARY_DIR=$libDir \
-		 OPENBLAS_INCLUDE_DIR=$includeDir
+		OPENBLAS_LIBRARY_DIR=$libDir \
+		OPENBLAS_INCLUDE_DIR=$includeDir \
+		NO_LAPACKE=1 \
+		NO_AFFINITY=1 \
+		NO_WARMUP=1 \
+		NUM_THREADS=64 \
+		DYNAMIC_ARCH=1 \
+		USE_OPENMP=1 \
+		${target:+TARGET=$target}
 
 	prepareInstalledDevelLibs libopenblas libopenblasp-r$portVersion
 
@@ -86,5 +99,12 @@ INSTALL()
 
 TEST()
 {
-	make tests DYNAMIC_ARCH=1 USE_OPENMP=1
+	make tests \
+		NO_LAPACKE=1 \
+		NO_AFFINITY=1 \
+		NO_WARMUP=1 \
+		NUM_THREADS=64 \
+		DYNAMIC_ARCH=1 \
+		USE_OPENMP=1 \
+		${target:+TARGET=$target}
 }