hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Simple updates to the Krell Institute OpenSpeedShop and CBTF components build package files. (#7812)

Browse source
This commit is contained in:
Jim Galarowicz 2018-04-18 14:05:53 -05:00 committed by Adam J. Stewart
parent 5d39e76353
commit 0fc51a9c3e
5 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py
View file

@ -52,10 +52,10 @@ class CbtfArgonavisGui(QMakePackage):
version('1.3.0', branch='master',
git='https://github.com/OpenSpeedShop/cbtf-argonavis-gui.git')
depends_on("cmake@3.0.2", type='build')
depends_on("cmake@3.0.2:", type='build')
depends_on("openspeedshop+cuda gui='qt4'")
depends_on('qt@4.8.6:')
depends_on("boost@1.50.0:1.59.0")
depends_on("boost@1.50.0:")
depends_on("cbtf")
depends_on("cbtf-krell")
depends_on("cbtf-argonavis")

2
var/spack/repos/builtin/packages/cbtf-argonavis/package.py
View file

@ -65,7 +65,7 @@ class CbtfArgonavis(CMakePackage):
description='CMake build type')
depends_on("cmake@3.0.2:", type='build')
depends_on("boost@1.50.0:1.59.0")
depends_on("boost@1.50.0:")
depends_on("papi")
depends_on("libmonitor")
depends_on("mrnet@5.0.1:+lwthreads")

4
var/spack/repos/builtin/packages/cbtf-krell/package.py
View file

@ -87,8 +87,8 @@ class CbtfKrell(CMakePackage):
depends_on("binutils")
# collectionTool
depends_on("boost@1.50.0:1.59.0")
depends_on("dyninst@9.3.2")
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")

2
var/spack/repos/builtin/packages/cbtf/package.py
View file

@ -64,7 +64,7 @@ class Cbtf(CMakePackage):
description='CMake build type')
depends_on("cmake@3.0.2:", type='build')
depends_on("boost@1.50.0:1.59.0")
depends_on("boost@1.50.0:")
depends_on("mrnet@5.0.1:+lwthreads")
depends_on("mrnet@5.0.1:+cti", when='+cti')
depends_on("xerces-c@3.1.1:")

6
var/spack/repos/builtin/packages/openspeedshop/package.py
View file

@ -121,8 +121,8 @@ class Openspeedshop(CMakePackage):
depends_on("elf", type="link")
depends_on("libdwarf")
depends_on("sqlite")
depends_on("boost@1.50.0:1.59.0")
depends_on("dyninst@9.3.2")
depends_on("boost@1.50.0:")
depends_on("dyninst@9.3.2:")
depends_on("python")
depends_on("libxml2+python")
depends_on("qt@3.3.8b+krellpatch", when='gui=qt3')
@ -362,6 +362,7 @@ def setup_environment(self, spack_env, run_env):
join_path(oss_libdir + '/openspeedshop'))
run_env.prepend_path('PATH', self.spec['papi'].prefix.bin)
run_env.prepend_path('PATH', self.spec['libdwarf'].prefix.bin)
run_env.prepend_path('PATH', self.spec['python'].prefix.bin)
if '+mpich' in self.spec:
run_env.set('OPENSS_MPI_IMPLEMENTATION', 'mpich')
@ -382,3 +383,4 @@ def setup_environment(self, spack_env, run_env):
run_env.prepend_path('PATH', self.spec['mrnet'].prefix.bin)
run_env.prepend_path('PATH', self.spec['cbtf-krell'].prefix.bin)
run_env.prepend_path('PATH', self.spec['cbtf-krell'].prefix.sbin)
run_env.prepend_path('PATH', self.spec['python'].prefix.bin)