diff options
| author | Tomoki, Karatsu <49965247+t-karatsu@users.noreply.github.com> | 2020-11-14 20:29:30 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-14 12:29:30 +0100 |
| commit | e6b001927130d3a731cb2477a1b25fc8f2e0542d (patch) | |
| tree | 51fec366e2ffe99bb832672a27587eb56f6df420 /var | |
| parent | 192bede002be9732e3eff54ab7ae4a64fa46fe47 (diff) | |
| download | spack-e6b001927130d3a731cb2477a1b25fc8f2e0542d.tar.gz spack-e6b001927130d3a731cb2477a1b25fc8f2e0542d.tar.bz2 spack-e6b001927130d3a731cb2477a1b25fc8f2e0542d.tar.xz spack-e6b001927130d3a731cb2477a1b25fc8f2e0542d.zip | |
openblas: fix to build v0.3.11 or later with Fujitsu compiler. (#19853)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/openblas/openblas_fujitsu_v0.3.11.patch | 14 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/openblas/package.py | 5 |
2 files changed, 17 insertions, 2 deletions
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') |