diff options
| author | Gilles Gouaillardet <ggouaillardet@users.noreply.github.com> | 2020-07-06 05:14:36 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-05 15:14:36 -0500 |
| commit | e5ec89ad5b89d4ef3e68d65f0b52ced7994f1da8 (patch) | |
| tree | c6fd9b4670f92dc64ab2c28f339f42781ae4c35e | |
| parent | 7bba9cd2a50ccfb14d1e1ad2b35c07c837f061cc (diff) | |
| download | spack-e5ec89ad5b89d4ef3e68d65f0b52ced7994f1da8.tar.gz spack-e5ec89ad5b89d4ef3e68d65f0b52ced7994f1da8.tar.bz2 spack-e5ec89ad5b89d4ef3e68d65f0b52ced7994f1da8.tar.xz spack-e5ec89ad5b89d4ef3e68d65f0b52ced7994f1da8.zip | |
openblas: fix fj compiler support in 0.3.10 (#17376)
The latest 0.3.10 version openblas changed how Fortran libraries
are detected, and this broke Fujitsu compiler support.
This (new) openblas patch addresses that issue.
| -rw-r--r-- | var/spack/repos/builtin/packages/openblas/openblas_fujitsu2.patch | 13 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/openblas/package.py | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/openblas/openblas_fujitsu2.patch b/var/spack/repos/builtin/packages/openblas/openblas_fujitsu2.patch new file mode 100644 index 0000000000..bfda30cced --- /dev/null +++ b/var/spack/repos/builtin/packages/openblas/openblas_fujitsu2.patch @@ -0,0 +1,13 @@ +--- OpenBLAS-0.3.10/f_check 2020-07-04 00:02:19.000000000 +0900 ++++ OpenBLAS-0.3.10/f_check_fix 2020-07-04 00:00:52.000000000 +0900 +@@ -337,8 +337,8 @@ + && ($flags !~ /kernel32/) + && ($flags !~ /advapi32/) + && ($flags !~ /shell32/) +- && ($flags !~ /omp/ || ($vendor !~ /PGI/ && $flags =~ /omp/)) +- && ($flags !~ /[0-9]+/) ++ && ($flags !~ /omp/ || ($vendor !~ /PGI/ && $vendor !~ /FUJITSU/ && $flags =~ /omp/)) ++ && ($flags !~ /[0-9]+/ || ($vendor == FUJITSU && $flags =~ /^-lfj90/)) + && ($flags !~ /^\-l$/) + ) { + $linker_l .= $flags . " "; diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py index 61a530b37f..ad0a6c82f8 100644 --- a/var/spack/repos/builtin/packages/openblas/package.py +++ b/var/spack/repos/builtin/packages/openblas/package.py @@ -99,6 +99,7 @@ class Openblas(MakefilePackage): # 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') # See https://github.com/spack/spack/issues/3036 conflicts('%intel@16', when='@0.2.15:0.2.19') |