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

cbtf-argonavis-gui: add openspeedshop-utils package to address qt conflicts (#8066)

Browse Source 
Fixes #7946

Creates an openspeedshop-utils package that does not depend on qt3
and can be used to resolve the needs of cbtf-argonavis-gui.

Changes for creating a release versus develop build are also
included. There are package versions which are no longer relevant
(e.g. 1.3.0 for cbtf-argonavis-gui has been replaced with 1.3.0.0)
but these versions need to be kept to allow uninstalling them;
issue #8173 has been created to investigate this.
This commit is contained in:
Jim Galarowicz
2018-05-17 14:04:33 -05:00
committed by scheibelp
parent de7d13b0e8
commit dfd168d557
8 changed files with 686 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,9 +54,15 @@ class CbtfKrell(CMakePackage):
"""
homepage = "http://sourceforge.net/p/cbtf/wiki/Home/"
version('1.9.1.0', branch='1.9.1.0',
git='https://github.com/OpenSpeedShop/cbtf-krell.git')
version('1.9.1', branch='master',
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..")
@@ -83,29 +89,53 @@ class CbtfKrell(CMakePackage):
# Dependencies for cbtf-krell
depends_on("cmake@3.0.2:", type='build')
# For binutils service
depends_on("binutils")
# For binutils
depends_on("binutils", when='@develop')
depends_on("binutils@2.29.1", when='@1.9.1.0')
# collectionTool
depends_on("boost@1.50.0:")
depends_on("dyninst@9.3.2:")
depends_on("mrnet@5.0.1:+cti", when='+cti')
depends_on("mrnet@5.0.1:+lwthreads")
# For boost
depends_on("boost@1.50.0:", when='@develop')
depends_on("boost@1.66.0", when='@1.9.1.0')
depends_on("xerces-c@3.1.1:")
depends_on("cbtf")
depends_on("cbtf+cti", when='+cti')
depends_on("cbtf+runtime", when='+runtime')
# For Dyninst
depends_on("dyninst@9.3.2:", when='@develop')
depends_on("dyninst@9.3.2", when='@1.9.1.0')
# 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')
# For Xerces-C
depends_on("xerces-c@3.1.1:", when='@develop')
depends_on("xerces-c@3.1.4", when='@1.9.1.0')
# For CBTF
depends_on("cbtf@develop", when='@develop')
depends_on("cbtf@1.9.1.0", when='@1.9.1.0')
# 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')
# 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')
# for services and collectors
depends_on("libmonitor+krellpatch")
depends_on("libunwind")
depends_on("papi")
depends_on("libunwind", when='@develop')
depends_on("libunwind@1.1", when='@1.9.1.0')
depends_on("papi", when='@develop')
depends_on("papi@5.5.1", when='@1.9.1.0')
depends_on("llvm-openmp-ompt@tr6_forwards+standalone")
# MPI Installations
# These have not worked either for build or execution, commenting out for
# now
depends_on("openmpi", when='+openmpi')
depends_on("mpich", when='+mpich')
depends_on("mpich2", when='+mpich2')