From e8cd9a3b3e88f2a1a98b589b96e604d249648f7b Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Tue, 5 Nov 2019 10:50:42 +0100
Subject: [PATCH 1/3] OpenBLAS: variants file for macOS 10.14 added

---
 Compiler/OpenBLAS/files/variants.macos10.14 | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 Compiler/OpenBLAS/files/variants.macos10.14

diff --git a/Compiler/OpenBLAS/files/variants.macos10.14 b/Compiler/OpenBLAS/files/variants.macos10.14
new file mode 100644
index 0000000..77a7739
--- /dev/null
+++ b/Compiler/OpenBLAS/files/variants.macos10.14
@@ -0,0 +1,18 @@
+OpenBLAS/0.2.9		stable		gcc/4.7.4
+OpenBLAS/0.2.9		stable		gcc/4.8.3
+OpenBLAS/0.2.9		stable		gcc/4.8.4
+OpenBLAS/0.2.9		stable		gcc/4.8.5
+OpenBLAS/0.2.9		stable		gcc/4.9.2
+OpenBLAS/0.2.9		stable		gcc/6.1.0
+OpenBLAS/0.2.9		stable		gcc/6.2.0
+OpenBLAS/0.2.19		stable		gcc/4.8.5
+OpenBLAS/0.2.19		stable		gcc/4.9.4
+OpenBLAS/0.2.19		stable		gcc/5.3.0
+OpenBLAS/0.2.19		stable		gcc/5.4.0
+OpenBLAS/0.2.19		stable		gcc/6.2.0
+OpenBLAS/0.2.19		stable		gcc/6.3.0
+
+OpenBLAS/0.2.20		stable		gcc/{5.5.0,6.4.0,7.3.0,7.4.0}
+OpenBLAS/0.2.20_omp	unstable	gcc/7.3.0
+OpenBLAS/0.2.20		stable		clang-macos/9.0.0
+OpenBLAS/0.2.20		stable		intel/17.4

From 17171b1b93bdab25d65e4ee634bfba8413d8107d Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Tue, 5 Nov 2019 11:21:41 +0100
Subject: [PATCH 2/3] OpenBLAS: fix in post-install

---
 Compiler/OpenBLAS/build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Compiler/OpenBLAS/build b/Compiler/OpenBLAS/build
index 183915d..30dd441 100755
--- a/Compiler/OpenBLAS/build
+++ b/Compiler/OpenBLAS/build
@@ -5,7 +5,7 @@ pbuild::set_download_url "http://github.com/xianyi/$P/archive/v${V_PKG}.tar.gz"
 pbuild::add_to_group 'Compiler'
 pbuild::compile_in_sourcetree
 pbuild::install_docfiles 'LICENSE' 'README.md'
-pbuild::set_supported_compilers 'gcc' 'intel' 'clang-macos'
+#pbuild::set_supported_compilers 'gcc' 'intel' 'clang-macos'
 
 pbuild::configure() {
 	case ${COMPILER} in
@@ -55,7 +55,7 @@ pbuild::post_install() {
 	# We have to build shared libs and remove them here.
 	# Building with NOSHARED gives an error during install -
 	# due to a bug in the Makefile(s).
-	rm -f "${PREFIX}/lib/"*.so
-	rm -f "${PREFIX}/lib/"*.dylib 
+	rm -f "${PREFIX}/lib/"lib*.{so,dylib}
+	rm -f "${PREFIX}/lib/"lib*.{so,dylib}.*
 }
 

From 0c409a7a968f00f218ff257ad06af16c891608d9 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Tue, 5 Nov 2019 11:22:20 +0100
Subject: [PATCH 3/3] OpenBLAS: version 0.3.7 with gcc/{7.4.0,8.3.0,9.2.0}
 added

---
 Compiler/OpenBLAS/files/variants.rhel6 | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/Compiler/OpenBLAS/files/variants.rhel6 b/Compiler/OpenBLAS/files/variants.rhel6
index c57998c..5e8c3cc 100644
--- a/Compiler/OpenBLAS/files/variants.rhel6
+++ b/Compiler/OpenBLAS/files/variants.rhel6
@@ -1,20 +1,8 @@
-OpenBLAS/0.2.9		stable		gcc/4.7.4
-OpenBLAS/0.2.9		stable		gcc/4.8.3
-OpenBLAS/0.2.9		stable		gcc/4.8.4
-OpenBLAS/0.2.9		stable		gcc/4.8.5
-OpenBLAS/0.2.9		stable		gcc/4.9.2
-OpenBLAS/0.2.9		stable		gcc/6.1.0
-OpenBLAS/0.2.9		stable		gcc/6.2.0
-OpenBLAS/0.2.19		stable		gcc/4.8.5
-OpenBLAS/0.2.19		stable		gcc/4.9.4
-OpenBLAS/0.2.19		stable		gcc/5.3.0
-OpenBLAS/0.2.19		stable		gcc/5.4.0
-OpenBLAS/0.2.19		stable		gcc/6.2.0
-OpenBLAS/0.2.19		stable		gcc/6.3.0
+OpenBLAS/0.2.9		stable		gcc/{4.7.4,4.8.3,4.8.4,4.8.5,4.9.2,6.1.0,6.2.0}
+OpenBLAS/0.2.19		stable		gcc/{4.8.5,4.9.4,5.3.0,5.4.0,6.2.0,6.3.0}
 
-OpenBLAS/0.2.20		stable		gcc/5.5.0
-OpenBLAS/0.2.20		stable		gcc/6.4.0
-OpenBLAS/0.2.20		stable		gcc/7.3.0
-OpenBLAS/0.2.20_omp	unstable	gcc/7.3.0
-OpenBLAS/0.2.20		stable		clang-macos/9.0.0
+OpenBLAS/0.2.20		stable		gcc/{5.5.0,6.4.0,7.3.0}
+OpenBLAS/0.2.20_omp	stable		gcc/7.3.0
 OpenBLAS/0.2.20		stable		intel/17.4
+
+OpenBLAS/0.3.7		stable		gcc/{7.4.0,8.3.0,9.2.0}