summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--var/spack/repos/builtin/packages/openblas/openblas_fujitsu.patch14
-rw-r--r--var/spack/repos/builtin/packages/openblas/package.py3
2 files changed, 17 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/openblas/openblas_fujitsu.patch b/var/spack/repos/builtin/packages/openblas/openblas_fujitsu.patch
new file mode 100644
index 0000000000..2a2a9a3429
--- /dev/null
+++ b/var/spack/repos/builtin/packages/openblas/openblas_fujitsu.patch
@@ -0,0 +1,14 @@
+--- OpenBLAS-0.3.6/f_check 2019-04-30 02:22:19.000000000 +0900
++++ OpenBLAS-0.3.6/f_check_fix 2019-08-05 10:31:56.066962193 +0900
+@@ -69,7 +69,10 @@
+ $bu = "_";
+ }
+
+- if ($data =~ /GNU/) {
++ if ($data =~ /Fujitsu/) {
++ $vendor = FUJITSU;
++ $openmp = "-Kopenmp";
++ } elsif ($data =~ /GNU/) {
+
+ $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 b7024265eb..93109e77f7 100644
--- a/var/spack/repos/builtin/packages/openblas/package.py
+++ b/var/spack/repos/builtin/packages/openblas/package.py
@@ -110,6 +110,9 @@ class Openblas(MakefilePackage):
sha256='f1b066a4481a50678caeb7656bf3e6764f45619686ac465f257c8017a2dc1ff0',
when='@0.3.0:0.3.3')
+ # Add conditions to f_check to determine the Fujitsu compiler
+ patch('openblas_fujitsu.patch', when='%fj')
+
conflicts('%intel@16', when='@0.2.15:0.2.19')
@property