From 2210a86ee4af3896e8e2a3ea8429c8ce0c0d8612 Mon Sep 17 00:00:00 2001
From: miqlas <5569059+extrowerk@users.noreply.github.com>
Date: Wed, 2 Jan 2019 15:27:02 +0100
Subject: [PATCH] BLIS: version bump (#3517)

---
 .../{blis-0.4.1.recipe => blis-0.5.1.recipe}  | 27 +++++++++++++++----
 ...lis-0.4.1.patchset => blis-0.5.1.patchset} |  0
 2 files changed, 22 insertions(+), 5 deletions(-)
 rename sci-libs/blis/{blis-0.4.1.recipe => blis-0.5.1.recipe} (81%)
 rename sci-libs/blis/patches/{blis-0.4.1.patchset => blis-0.5.1.patchset} (100%)

diff --git a/sci-libs/blis/blis-0.4.1.recipe b/sci-libs/blis/blis-0.5.1.recipe
similarity index 81%
rename from sci-libs/blis/blis-0.4.1.recipe
rename to sci-libs/blis/blis-0.5.1.recipe
index 3f2c62f0f..4944f2071 100644
--- a/sci-libs/blis/blis-0.4.1.recipe
+++ b/sci-libs/blis/blis-0.5.1.recipe
@@ -8,23 +8,29 @@ new BLAS-like API, it also includes a BLAS compatibility layer which gives \
 application developers access to BLIS implementations via traditional BLAS \
 routine calls. An object-based API unique to BLIS is also available."
 HOMEPAGE="https://github.com/flame/blis"
-COPYRIGHT="2014 The University of Texas at Austin"
+COPYRIGHT="2014 The University of Texas at Austin
+	2018 Advanced Micro Devices, Inc."
 LICENSE="BSD (3-clause)"
 REVISION="1"
 SOURCE_URI="https://github.com/flame/blis/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="a0c00e6e4ae215e8d965226c2446c2e53f121b31c3b8ff5ca983b0a51ed2fd25"
+CHECKSUM_SHA256="7816a1f6085b1d779f074bca2435c195c524582edbb04d9cd399dade9187a72d"
 PATCHES="blis-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86"
 
+TARGET="generic"
+if [ "$effectiveTargetArchitecture" = x86_64 ]; then
+TARGET="x86_64"
+fi
+
 GLOBAL_WRITABLE_FILES="
 	settings/blis/common.mk keep-old
-	settings/blis/config/haswell/make_defs.mk keep-old
+	settings/blis/config/$TARGET/make_defs.mk keep-old
 	settings/blis/config.mk keep-old
 	"
 
-libVersion="1.0.0"
+libVersion="2.0.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
@@ -68,7 +74,7 @@ BUILD()
 		--libdir=$libDir \
 		--includedir=$includeDir \
 		--sharedir=$settingsDir \
-		auto
+		$TARGET # CPU target
 	make $jobArgs
 }
 
@@ -83,3 +89,14 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
+
+TEST()
+{
+	cd blastest
+	make $jobArgs
+	make run
+	cd ..
+	cd testsuite
+	make $jobArgs
+	./test_libblis.x
+}
diff --git a/sci-libs/blis/patches/blis-0.4.1.patchset b/sci-libs/blis/patches/blis-0.5.1.patchset
similarity index 100%
rename from sci-libs/blis/patches/blis-0.4.1.patchset
rename to sci-libs/blis/patches/blis-0.5.1.patchset