summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValentin Volkl <valentin.volkl@cern.ch>2021-08-30 11:37:39 +0200
committerGitHub <noreply@github.com>2021-08-30 11:37:39 +0200
commit2f777d08a2e1c6cdde4cc7138b3e7041d73eeee8 (patch)
treecd474bdab645b1478fb6e13d39f52b69c2f9904f
parent9be81ac4d9eb459e15637c40913a767785e10742 (diff)
downloadspack-2f777d08a2e1c6cdde4cc7138b3e7041d73eeee8.tar.gz
spack-2f777d08a2e1c6cdde4cc7138b3e7041d73eeee8.tar.bz2
spack-2f777d08a2e1c6cdde4cc7138b3e7041d73eeee8.tar.xz
spack-2f777d08a2e1c6cdde4cc7138b3e7041d73eeee8.zip
rivet: fixes for gcc@10: (#25454)
-rw-r--r--var/spack/repos/builtin/packages/rivet/package.py2
-rw-r--r--var/spack/repos/builtin/packages/yoda/package.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/rivet/package.py b/var/spack/repos/builtin/packages/rivet/package.py
index c684558155..e9f394474f 100644
--- a/var/spack/repos/builtin/packages/rivet/package.py
+++ b/var/spack/repos/builtin/packages/rivet/package.py
@@ -98,7 +98,7 @@ class Rivet(AutotoolsPackage):
depends_on('yoda@1.8.0', when='@3.1.0')
depends_on('yoda@1.8.2', when='@3.1.1')
depends_on('yoda@1.8.3', when='@3.1.2')
- depends_on('yoda@1.8.5', when='@3.1.3')
+ depends_on('yoda@1.8.5:', when='@3.1.3:')
# The following versions were not a part of LCG stack
# and thus the exact version of YODA is unknown
diff --git a/var/spack/repos/builtin/packages/yoda/package.py b/var/spack/repos/builtin/packages/yoda/package.py
index df7273389b..45ae109040 100644
--- a/var/spack/repos/builtin/packages/yoda/package.py
+++ b/var/spack/repos/builtin/packages/yoda/package.py
@@ -69,7 +69,7 @@ class Yoda(AutotoolsPackage):
depends_on('py-cython@0.23.5:', type='build', when='@1.6.5:1.8.0')
depends_on('py-cython@0.24:', type='build', when='@1.8.0:')
depends_on('py-matplotlib', when='@1.3.0:', type=('build', 'run'))
- depends_on('root', type=('build', 'run'), when='+root')
+ depends_on('root', type=('build', 'link', 'run'), when='+root')
patch('yoda-1.5.5.patch', level=0, when='@1.5.5')
patch('yoda-1.5.9.patch', level=0, when='@1.5.9')