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

45
var/spack/repos/builtin/packages/openspeedshop/package.py
View File

@@ -112,18 +112,17 @@ class Openspeedshop(CMakePackage):
description="Build mpi collector for mpich\
MPI when variant is enabled.")
depends_on("cmake@3.11.1", when='@2.3.1.3:', type='build')
depends_on("cmake@3.0.2:", when='@develop', type='build')
depends_on("cmake@3.0.2:", type='build')
# Dependencies for openspeedshop that are common to all
# the variants of the OpenSpeedShop build
depends_on("libtool", type='build')
depends_on("bison", type='build')
depends_on("flex", type='build')
depends_on("flex@2.6.1", type='build')
# For binutils
depends_on("binutils", when='@develop', type='build')
depends_on("binutils@2.29.1", when='@2.3.1.3:', type='build')
depends_on("binutils@2.29.1", when='@2.3.1.3:9999', type='build')
depends_on("elf", type="link")
depends_on("libdwarf")
@@ -132,59 +131,58 @@ class Openspeedshop(CMakePackage):
# For boost
depends_on("boost@1.50.0:", when='@develop')
depends_on("boost@1.66.0", when='@2.3.1.3:')
depends_on("boost@1.66.0", when='@2.3.1.3:9999')
depends_on("dyninst@9.3.2:", when='@develop')
depends_on("dyninst@9.3.2", when='@2.3.1.3:')
depends_on("dyninst@develop", when='@develop')
depends_on("dyninst@9.3.2", when='@2.3.1.3:9999')
depends_on("python", when='@develop')
depends_on("python@2.7.14", when='@2.3.1.3:')
depends_on("python@2.7.14:2.7.15", when='@2.3.1.3:9999')
depends_on("libxml2", when='@develop')
depends_on("libxml2@2.9.4", when='@2.3.1.3:')
depends_on("libxml2")
depends_on("qt@3.3.8b+krellpatch", when='gui=qt3')
# Dependencies for the openspeedshop cbtf packages.
depends_on("cbtf@develop", when='@develop')
depends_on("cbtf@1.9.1.0:", when='@2.3.1.3:')
depends_on("cbtf@1.9.1.0:9999", when='@2.3.1.3:9999')
depends_on("cbtf-krell@develop", when='@develop')
depends_on("cbtf-krell@1.9.1.0:", when='@2.3.1.3:')
depends_on("cbtf-krell@1.9.1.0:9999", when='@2.3.1.3:9999')
depends_on('cbtf-krell@develop+crayfe', when='@develop+crayfe')
depends_on('cbtf-krell@1.9.1.0:+crayfe', when='@2.3.1.3:+crayfe')
depends_on('cbtf-krell@1.9.1.0:9999+crayfe', when='@2.3.1.3:9999+crayfe')
depends_on('cbtf-krell@develop+cti', when='@develop+cti')
depends_on('cbtf-krell@1.9.1.0:+cti', when='@2.3.1.3:+cti')
depends_on('cbtf-krell@1.9.1.0:9999+cti', when='@2.3.1.3:9999+cti')
depends_on('cbtf-krell@develop+mpich', when='@develop+mpich')
depends_on('cbtf-krell@1.9.1.0:+mpich', when='@2.3.1.3:+mpich')
depends_on('cbtf-krell@1.9.1.0:9999+mpich', when='@2.3.1.3:9999+mpich')
depends_on('cbtf-krell@develop+mpich2', when='@develop+mpich2')
depends_on('cbtf-krell@1.9.1.0:+mpich2', when='@2.3.1.3:+mpich2')
depends_on('cbtf-krell@1.9.1.0:9999+mpich2', when='@2.3.1.3:9999+mpich2')
depends_on('cbtf-krell@develop+mpt', when='@develop+mpt')
depends_on('cbtf-krell@1.9.1.0:+mpt', when='@2.3.1.3:+mpt')
depends_on('cbtf-krell@1.9.1.0:9999+mpt', when='@2.3.1.3:9999+mpt')
depends_on('cbtf-krell@develop+mvapich', when='@develop+mvapich')
depends_on('cbtf-krell@1.9.1.0:+mvapich', when='@2.3.1.3:+mvapich')
depends_on('cbtf-krell@1.9.1.0:9999+mvapich', when='@2.3.1.3:9999+mvapich')
depends_on('cbtf-krell@develop+mvapich2', when='@develop+mvapich2')
depends_on('cbtf-krell@1.9.1.0:+mvapich2', when='@2.3.1.3:+mvapich2')
depends_on('cbtf-krell@1.9.1.0:9999+mvapich2', when='@2.3.1.3:9999+mvapich2')
depends_on('cbtf-krell@develop+openmpi', when='@develop+openmpi')
depends_on('cbtf-krell@1.9.1.0:+openmpi', when='@2.3.1.3:+openmpi')
depends_on('cbtf-krell@1.9.1.0:9999+openmpi', when='@2.3.1.3:9999+openmpi')
depends_on("cbtf-argonavis@develop", when='@develop+cuda')
depends_on("cbtf-argonavis@1.9.1.0:", when='@2.3.1.3:+cuda')
depends_on("cbtf-argonavis@1.9.1.0:9999", when='@2.3.1.3:9999+cuda')
# For MRNet
depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti')
depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop')
depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3:+cti')
depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3:')
depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3:9999+cti')
depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3:9999')
parallel = False
@@ -229,7 +227,6 @@ def cmake_args(self):
if spec.satisfies('+runtime'):
# Appends base options to cmake_args
self.set_defaultbase_cmakeOptions(spec, cmake_args)
cmake_args.extend(
['-DCMAKE_CXX_FLAGS=%s' % compile_flags,
'-DCMAKE_C_FLAGS=%s' % compile_flags,