From 2f777d08a2e1c6cdde4cc7138b3e7041d73eeee8 Mon Sep 17 00:00:00 2001 From: Valentin Volkl Date: Mon, 30 Aug 2021 11:37:39 +0200 Subject: rivet: fixes for gcc@10: (#25454) --- var/spack/repos/builtin/packages/rivet/package.py | 2 +- var/spack/repos/builtin/packages/yoda/package.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'var') 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') -- cgit v1.2.3-70-g09d2