zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add changes to the Krell packages with version updates and ranges for the latest release. (#8468)

Browse Source 
* Add changes to the Krell packages with version updates and ranges for the latest release.

* Add reviewer requested changes.  Remove preferred clauses and update the qt version for the cbtf-argonavis-gui@develop

* Trigger integration/test restart
This commit is contained in:
Jim Galarowicz
2018-06-17 09:49:27 -05:00
committed by Adam J. Stewart
parent afe7964670
commit ec66e0fb7e
7 changed files with 99 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
var/spack/repos/builtin/packages/cbtf-argonavis/package.py
View File

@@ -70,8 +70,7 @@ class CbtfArgonavis(CMakePackage):
variant('build_type', default='None', values=('None'),
description='CMake build type')
depends_on("cmake@3.11.1", when='@1.9.1.0:', type='build')
depends_on("cmake@3.0.2:", when='@develop', type='build')
depends_on("cmake@3.0.2:", type='build')
# To specify ^elfutils@0.170 on the command line spack
# apparently needs/wants this dependency explicity here
@@ -80,42 +79,42 @@ class CbtfArgonavis(CMakePackage):
# For boost
depends_on("boost@1.50.0:", when='@develop')
depends_on("boost@1.66.0", when='@1.9.1.0:')
depends_on("boost@1.66.0", when='@1.9.1.0:9999')
# For MRNet
depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti')
depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop~cti')
depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0:+cti')
depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:~cti')
depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0:9999+cti')
depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:9999~cti')
# For CBTF
depends_on("cbtf@develop", when='@develop')
depends_on("cbtf@1.9.1.0:", when='@1.9.1.0:')
depends_on("cbtf@1.9.1.0:9999", when='@1.9.1.0:9999')
# For CBTF with cti
depends_on("cbtf@develop+cti", when='@develop+cti')
depends_on("cbtf@1.9.1.0:+cti", when='@1.9.1.0:+cti')
depends_on("cbtf@1.9.1.0:9999+cti", when='@1.9.1.0:9999+cti')
# For CBTF with runtime
depends_on("cbtf@develop+runtime", when='@develop+runtime')
depends_on("cbtf@1.9.1.0:+runtime", when='@1.9.1.0:+runtime')
depends_on("cbtf@1.9.1.0:9999+runtime", when='@1.9.1.0:9999+runtime')
# For libmonitor
depends_on("libmonitor+krellpatch")
# For PAPI
depends_on("papi", when='@develop')
depends_on("papi@5.5.1", when='@1.9.1.0:')
depends_on("papi@5.5.1", when='@1.9.1.0:9999')
# For CBTF-KRELL
depends_on("cbtf-krell@develop", when='@develop')
depends_on("cbtf-krell@1.9.1.0:", when='@1.9.1.0:')
depends_on("cbtf-krell@1.9.1.0:9999", when='@1.9.1.0:9999')
depends_on('cbtf-krell@develop+cti', when='@develop+cti')
depends_on('cbtf-krell@1.9.1.0:+cti', when='@1.9.1.0:+cti')
depends_on('cbtf-krell@1.9.1.0:9999+cti', when='@1.9.1.0:9999+cti')
depends_on('cbtf-krell@develop+runtime', when='@develop+runtime')
depends_on('cbtf-krell@1.9.1.0:+runtime', when='@1.9.1.0:+runtime')
depends_on('cbtf-krell@1.9.1.0:9999+runtime', when='@1.9.1.0:9999+runtime')
# For CUDA
depends_on("cuda")