summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authora-saitoh-fj <63334055+a-saitoh-fj@users.noreply.github.com>2020-12-25 08:05:01 +0900
committerGitHub <noreply@github.com>2020-12-24 17:05:01 -0600
commit4ef3fb943437d624b9b9744b152a4f9ccc1cd221 (patch)
tree1de2c404fd4ce1dfc67c929299b88deeb421dc12 /var
parent906698216896844045944726ebfd902b121f722a (diff)
downloadspack-4ef3fb943437d624b9b9744b152a4f9ccc1cd221.tar.gz
spack-4ef3fb943437d624b9b9744b152a4f9ccc1cd221.tar.bz2
spack-4ef3fb943437d624b9b9744b152a4f9ccc1cd221.tar.xz
spack-4ef3fb943437d624b9b9744b152a4f9ccc1cd221.zip
Fixed for merging patches for Fujitsu compiler in version 0.3.13 (#20539)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/openblas/package.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py
index c1a57e03ca..91281fa52f 100644
--- a/var/spack/repos/builtin/packages/openblas/package.py
+++ b/var/spack/repos/builtin/packages/openblas/package.py
@@ -109,9 +109,11 @@ 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
+ # See https://github.com/xianyi/OpenBLAS/pull/3010
+ # UPD: the patch has been merged starting version 0.3.13
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')
+ patch('openblas_fujitsu_v0.3.11.patch', when='@0.3.11:0.3.12 %fj')
+ patch('openblas_fujitsu2.patch', when='@0.3.10:0.3.12 %fj')
# See https://github.com/spack/spack/issues/19932#issuecomment-733452619
conflicts('%gcc@7.0.0:7.3.99,8.0.0:8.2.99', when='@0.3.11:')