From 5e782f6a23a55a1db13a100803f73a9e1ff19c4c Mon Sep 17 00:00:00 2001
From: Olivier Cessenat <cessenat@gmail.com>
Date: Fri, 21 May 2021 09:31:31 +0200
Subject: gsl: update external-cblas patch directive (#23787)
---
var/spack/repos/builtin/packages/gsl/package.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/var/spack/repos/builtin/packages/gsl/package.py b/var/spack/repos/builtin/packages/gsl/package.py
index 173f6742fa..b12e7fa3b6 100644
--- a/var/spack/repos/builtin/packages/gsl/package.py
+++ b/var/spack/repos/builtin/packages/gsl/package.py
@@ -29,9 +29,10 @@ class Gsl(AutotoolsPackage, GNUMirrorPackage):
variant('external-cblas', default=False, description='Build against external blas')
# from https://dev.gentoo.org/~mgorny/dist/gsl-2.3-cblas.patch.bz2
- patch('gsl-2.3-cblas.patch', when="+external-cblas")
+ patch('gsl-2.3-cblas.patch', when="@2.3:2.5.99+external-cblas")
+
+ conflicts('+external-cblas', when="@:2.2.99")
- conflicts('+external-cblas', when="@:2.2.9999")
depends_on('m4', type='build', when='+external-cblas')
depends_on('autoconf', type='build', when='+external-cblas')
depends_on('automake', type='build', when='+external-cblas')
--
cgit v1.2.3-70-g09d2