From 4ef3fb943437d624b9b9744b152a4f9ccc1cd221 Mon Sep 17 00:00:00 2001 From: a-saitoh-fj <63334055+a-saitoh-fj@users.noreply.github.com> Date: Fri, 25 Dec 2020 08:05:01 +0900 Subject: Fixed for merging patches for Fujitsu compiler in version 0.3.13 (#20539) --- var/spack/repos/builtin/packages/openblas/package.py | 6 ++++-- 1 file 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:') -- cgit v1.2.3-70-g09d2