diff options
| author | Jim Galarowicz <jeg@krellinst.org> | 2018-04-18 14:05:53 -0500 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2018-04-18 14:05:53 -0500 |
| commit | 0fc51a9c3eb8d6632b7cec18cd38758d03b77b57 (patch) | |
| tree | 82fadf0f04ae7b1b53ac5740db82a2e7d96205bb /var | |
| parent | 5d39e763539cc3acc0bc9a077c06f3123b0d1a3f (diff) | |
| download | spack-0fc51a9c3eb8d6632b7cec18cd38758d03b77b57.tar.gz spack-0fc51a9c3eb8d6632b7cec18cd38758d03b77b57.tar.bz2 spack-0fc51a9c3eb8d6632b7cec18cd38758d03b77b57.tar.xz spack-0fc51a9c3eb8d6632b7cec18cd38758d03b77b57.zip | |
Simple updates to the Krell Institute OpenSpeedShop and CBTF components build package files. (#7812)
Diffstat (limited to 'var')
5 files changed, 10 insertions, 8 deletions
diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py index 05b8ebe537..c4154592fa 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py @@ -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") diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py index b7b2dfa52a..de65bca6de 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py @@ -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") diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index 42938c3713..862250e002 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -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") diff --git a/var/spack/repos/builtin/packages/cbtf/package.py b/var/spack/repos/builtin/packages/cbtf/package.py index 4e68e21d5b..97d94ff20e 100644 --- a/var/spack/repos/builtin/packages/cbtf/package.py +++ b/var/spack/repos/builtin/packages/cbtf/package.py @@ -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:") diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index 39df30afd2..d848df1073 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -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 @@ class Openspeedshop(CMakePackage): 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 @@ class Openspeedshop(CMakePackage): 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) |