From e6b001927130d3a731cb2477a1b25fc8f2e0542d Mon Sep 17 00:00:00 2001
From: "Tomoki, Karatsu" <49965247+t-karatsu@users.noreply.github.com>
Date: Sat, 14 Nov 2020 20:29:30 +0900
Subject: openblas: fix to build v0.3.11 or later with Fujitsu compiler.
 (#19853)

---
 .../packages/openblas/openblas_fujitsu_v0.3.11.patch       | 14 ++++++++++++++
 var/spack/repos/builtin/packages/openblas/package.py       |  5 +++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 var/spack/repos/builtin/packages/openblas/openblas_fujitsu_v0.3.11.patch

(limited to 'var')

diff --git a/var/spack/repos/builtin/packages/openblas/openblas_fujitsu_v0.3.11.patch b/var/spack/repos/builtin/packages/openblas/openblas_fujitsu_v0.3.11.patch
new file mode 100644
index 0000000000..c23299fc20
--- /dev/null
+++ b/var/spack/repos/builtin/packages/openblas/openblas_fujitsu_v0.3.11.patch
@@ -0,0 +1,14 @@
+--- spack-src/f_check.org	2020-11-11 10:48:18.827643938 +0900
++++ spack-src/f_check	2020-11-11 10:51:46.448618264 +0900
+@@ -69,7 +69,10 @@
+ 	    $bu       = "_";
+ 	}
+ 
+-	if ($data =~ /GNU/ || $data =~ /GCC/ ) {
++        if ($data =~ /Fujitsu/) {
++            $vendor = FUJITSU;
++            $openmp = "-Kopenmp";
++        } elsif ($data =~ /GNU/ || $data =~ /GCC/ ) {
+ 
+ 	    $data =~ /(\d+)\.(\d+).(\d+)/;
+ 	    $major = $1;
diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py
index 4cbeed0938..4121d558b7 100644
--- a/var/spack/repos/builtin/packages/openblas/package.py
+++ b/var/spack/repos/builtin/packages/openblas/package.py
@@ -108,8 +108,9 @@ class Openblas(MakefilePackage):
           when='@0.3.8:0.3.10 %apple-clang@12.0.0:')
 
     # Add conditions to f_check to determine the Fujitsu compiler
-    patch('openblas_fujitsu.patch', when='%fj')
-    patch('openblas_fujitsu2.patch', when='@0.3.10 %fj')
+    patch('openblas_fujitsu.patch', when='@:0.3.10 %fj')
+    patch('openblas_fujitsu_v0.3.11.patch', when='@0.3.11: %fj')
+    patch('openblas_fujitsu2.patch', when='@0.3.10: %fj')
 
     # See https://github.com/spack/spack/issues/3036
     conflicts('%intel@16', when='@0.2.15:0.2.19')
-- 
cgit v1.2.3-60-g2f50