diff options
Diffstat (limited to 'var/spack/repos/builtin/packages/cbtf-argonavis/package.py')
| -rw-r--r-- | var/spack/repos/builtin/packages/cbtf-argonavis/package.py | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py index 887322330a..dc692704de 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py @@ -18,8 +18,6 @@ class CbtfArgonavis(CMakePackage): version('1.9.4', branch='1.9.4') version('1.9.3', branch='1.9.3') - variant('cti', default=False, - description="Build MRNet with the CTI startup option") variant('crayfe', default=False, description="build only the FE tool using the runtime_dir \ to point to target build.") @@ -41,19 +39,13 @@ class CbtfArgonavis(CMakePackage): depends_on("boost@1.70.0:") # For MRNet - depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti', type=('build', 'link', 'run')) - depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop~cti', type=('build', 'link', 'run')) - depends_on("mrnet@5.0.1-3+cti", when='@1.9.3:9999+cti', type=('build', 'link', 'run')) - depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.3:9999~cti', type=('build', 'link', 'run')) + depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop', type=('build', 'link', 'run')) + depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.3:9999', type=('build', 'link', 'run')) # For CBTF depends_on("cbtf@develop", when='@develop', type=('build', 'link', 'run')) depends_on("cbtf@1.9.3:9999", when='@1.9.3:9999', type=('build', 'link', 'run')) - # For CBTF with cti - depends_on("cbtf@develop+cti", when='@develop+cti', type=('build', 'link', 'run')) - depends_on("cbtf@1.9.3:9999+cti", when='@1.9.3:9999+cti', type=('build', 'link', 'run')) - # For CBTF with runtime depends_on("cbtf@develop+runtime", when='@develop+runtime', type=('build', 'link', 'run')) depends_on("cbtf@1.9.3:9999+runtime", when='@1.9.3:9999+runtime', type=('build', 'link', 'run')) @@ -68,9 +60,6 @@ class CbtfArgonavis(CMakePackage): depends_on("cbtf-krell@develop", when='@develop', type=('build', 'link', 'run')) depends_on("cbtf-krell@1.9.3:9999", when='@1.9.3:9999', type=('build', 'link', 'run')) - depends_on('cbtf-krell@develop+cti', when='@develop+cti', type=('build', 'link', 'run')) - depends_on('cbtf-krell@1.9.3:9999+cti', when='@1.9.3:9999+cti', type=('build', 'link', 'run')) - depends_on('cbtf-krell@develop+runtime', when='@develop+runtime', type=('build', 'link', 'run')) depends_on('cbtf-krell@1.9.3:9999+runtime', when='@1.9.3:9999+runtime', type=('build', 'link', 'run')) |