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

36
var/spack/repos/builtin/packages/cbtf-krell/package.py
View File

@@ -55,15 +55,15 @@ class CbtfKrell(CMakePackage):
homepage = "http://sourceforge.net/p/cbtf/wiki/Home/"
url = "https://github.com/OpenSpeedShop/cbtf-krell.git"
version('develop', branch='master',
git='https://github.com/OpenSpeedShop/cbtf-krell.git')
version('1.9.1.1', branch='1.9.1.1',
git='https://github.com/OpenSpeedShop/cbtf-krell.git')
version('1.9.1.0', branch='1.9.1.0',
git='https://github.com/OpenSpeedShop/cbtf-krell.git')
version('develop', branch='master',
git='https://github.com/OpenSpeedShop/cbtf-krell.git')
# MPI variants
variant('openmpi', default=False,
description="Build mpi experiment collector for openmpi MPI..")
@@ -88,52 +88,51 @@ class CbtfKrell(CMakePackage):
to point to target build.")
# Dependencies for cbtf-krell
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')
# For binutils
depends_on("binutils", when='@develop')
depends_on("binutils@2.29.1", when='@1.9.1.0:')
depends_on("binutils@2.29.1", when='@1.9.1.0:9999')
# 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 Dyninst
depends_on("dyninst@9.3.2:", when='@develop')
depends_on("dyninst@9.3.2", when='@1.9.1.0:')
depends_on("dyninst@develop", when='@develop')
depends_on("dyninst@9.3.2", 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')
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:')
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')
# For Xerces-C
depends_on("xerces-c@3.1.1:", when='@develop')
depends_on("xerces-c@3.1.4", when='@1.9.1.0:')
depends_on("xerces-c@3.1.4", when='@1.9.1.0:9999')
# 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 services and collectors
depends_on("libmonitor+krellpatch")
depends_on("libunwind", when='@develop')
depends_on("libunwind@1.1", when='@1.9.1.0:')
depends_on("libunwind@1.1", when='@1.9.1.0:9999')
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')
depends_on("llvm-openmp-ompt@tr6_forwards+standalone")
@@ -145,6 +144,8 @@ class CbtfKrell(CMakePackage):
depends_on("mvapich", when='+mvapich')
depends_on("mpt", when='+mpt')
depends_on("gotcha")
parallel = False
build_directory = 'build_cbtf_krell'
@@ -251,6 +252,7 @@ def cmake_args(self):
'-DMRNET_DIR=%s' % spec['mrnet'].prefix,
'-DDYNINST_DIR=%s' % spec['dyninst'].prefix,
'-DLIBIOMP_DIR=%s' % spec['llvm-openmp-ompt'].prefix,
'-DGOTCHA_DIR=%s' % spec['gotcha'].prefix,
'-DXERCESC_DIR=%s' % spec['xerces-c'].prefix]
if self.spec.satisfies('+runtime'):