From 1a85c3cd43499baec65f157f5a7d5fd4325b7733 Mon Sep 17 00:00:00 2001 From: Robert Brunner Date: Fri, 16 Apr 2021 17:29:55 -0500 Subject: str: When building @develop branch, use @master for several dependencies. (#22916) --- var/spack/repos/builtin/packages/scr/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/scr/package.py b/var/spack/repos/builtin/packages/scr/package.py index 28513e5ce6..eedebc1288 100644 --- a/var/spack/repos/builtin/packages/scr/package.py +++ b/var/spack/repos/builtin/packages/scr/package.py @@ -37,13 +37,16 @@ class Scr(CMakePackage): depends_on('axl@master', when="@develop") depends_on('kvtree@master', when="@develop") depends_on('redset@master', when="@develop") + depends_on('er@master', when="@develop") + depends_on('rankstr@master', when="@develop") + depends_on('shuffile@master', when="@develop") # SCR legacy is anything 2.x.x or earlier # SCR components is anything 3.x.x or later depends_on('er', when="@3:") depends_on('kvtree', when="@3:") depends_on('rankstr', when="@3:") - depends_on('filo', when="@3:") + depends_on('filo', when="@3") depends_on('spath', when="@3:") # DTCMP is an optional dependency up until 3.x -- cgit v1.2.3-70-g09d2