OpenSpeedShop/CBTF package updates and fixes (#11470)

This avoids using Boost 1.70.0, fixes library access in OpenSpeedShop
packages, adds new versions, and updates QT dependency constraints
in CBTF and OpenSpeedShop packages

- Constrain Boost dependency to 1.69.0 or earlier to avoid issues
  with 1.70.0 for Open|SpeedShop and CBTF packages
- Update DYNINSTAPI_RT_LIB environment variable to use single library
  from "find_libraries" (which returns a list) in OpenSpeedShop
  packages
  Fixes #11443
- Add version 1.9.3 for CBTF Argo Navis, CBTF Krell, CBTF LANL, and
  CBTF packages
- Add version 2.4.1 for OpenSpeedShop Utils and OpenSpeedShop
  packages
- Update QT dependency to 5.10.0 or greater for QtGraph and CBTF Argo
  Navis packages

8 files changed, 18 insertions, 13 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 782ab63399..58d699b7da 100644
--- a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py
+++ b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py
@@ -19,10 +19,9 @@ class CbtfArgonavisGui(QMakePackage):
 
     depends_on("cmake@3.0.2:", type='build')
 
-    depends_on('qt@5.10.0:', when='@develop')
-    depends_on('qt@5.10.0', when='@1.3.0.0:9999')
+    depends_on('qt@5.10.0:')
 
-    depends_on("boost@1.66.0:")
+    depends_on("boost@1.66.0:1.69.0")
 
     # For MRNet
     depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop')
diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py
index ecd2a46d1f..93fcfe204f 100644
--- a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py
+++ b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py
@@ -14,6 +14,7 @@ class CbtfArgonavis(CMakePackage):
     git      = "https://github.com/OpenSpeedShop/cbtf-argonavis.git"
 
     version('develop', branch='master')
+    version('1.9.3', branch='1.9.3')
     version('1.9.2', branch='1.9.2')
     version('1.9.1.2', branch='1.9.1.2')
     version('1.9.1.1', branch='1.9.1.1')
@@ -37,7 +38,7 @@ class CbtfArgonavis(CMakePackage):
     depends_on("elf", type="link")
 
     # For boost
-    depends_on("boost@1.66.0:")
+    depends_on("boost@1.66.0:1.69.0")
 
     # For MRNet
     depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti')
diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py
index 3b7fb142de..ecaaccb3be 100644
--- a/var/spack/repos/builtin/packages/cbtf-krell/package.py
+++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py
@@ -18,6 +18,7 @@ class CbtfKrell(CMakePackage):
     git      = "https://github.com/OpenSpeedShop/cbtf-krell.git"
 
     version('develop', branch='master')
+    version('1.9.3', branch='1.9.3')
     version('1.9.2', branch='1.9.2')
     version('1.9.1.2', branch='1.9.1.2')
     version('1.9.1.1', branch='1.9.1.1')
@@ -53,7 +54,7 @@ class CbtfKrell(CMakePackage):
     depends_on("binutils")
 
     # For boost
-    depends_on("boost@1.66.0:")
+    depends_on("boost@1.66.0:1.69.0")
 
     # For Dyninst
     depends_on("dyninst@develop", when='@develop')
diff --git a/var/spack/repos/builtin/packages/cbtf-lanl/package.py b/var/spack/repos/builtin/packages/cbtf-lanl/package.py
index 7b3af7ea91..41eabbe0d8 100644
--- a/var/spack/repos/builtin/packages/cbtf-lanl/package.py
+++ b/var/spack/repos/builtin/packages/cbtf-lanl/package.py
@@ -14,6 +14,7 @@ class CbtfLanl(CMakePackage):
     git      = "https://github.com/OpenSpeedShop/cbtf-lanl.git"
 
     version('develop', branch='master')
+    version('1.9.3', branch='1.9.3')
     version('1.9.2', branch='1.9.2')
     version('1.9.1.2', branch='1.9.1.2')
     version('1.9.1.1', branch='1.9.1.1')
diff --git a/var/spack/repos/builtin/packages/cbtf/package.py b/var/spack/repos/builtin/packages/cbtf/package.py
index b316bc85eb..eabf029d18 100644
--- a/var/spack/repos/builtin/packages/cbtf/package.py
+++ b/var/spack/repos/builtin/packages/cbtf/package.py
@@ -17,6 +17,7 @@ class Cbtf(CMakePackage):
     git      = "https://github.com/OpenSpeedShop/cbtf.git"
 
     version('develop', branch='master')
+    version('1.9.3', branch='1.9.3')
     version('1.9.2', branch='1.9.2')
     version('1.9.1.2', branch='1.9.1.2')
     version('1.9.1.1', branch='1.9.1.1')
@@ -33,7 +34,7 @@ class Cbtf(CMakePackage):
 
     depends_on("cmake@3.0.2:", type='build')
 
-    depends_on("boost@1.66.0:")
+    depends_on("boost@1.66.0:1.69.0")
 
     # For MRNet
     depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti')
diff --git a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py
index b4d621f390..cec1c92dc3 100644
--- a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py
+++ b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py
@@ -35,6 +35,7 @@ class OpenspeedshopUtils(CMakePackage):
     git      = "https://github.com/OpenSpeedShop/openspeedshop.git"
 
     version('develop', branch='master')
+    version('2.4.1', branch='2.4.1')
     version('2.4.0', branch='2.4.0')
     version('2.3.1.5', branch='2.3.1.5')
     version('2.3.1.4', branch='2.3.1.4')
@@ -90,13 +91,13 @@ class OpenspeedshopUtils(CMakePackage):
     depends_on("sqlite")
 
     # For boost
-    depends_on("boost@1.66.0:")
+    depends_on("boost@1.66.0:1.69.0")
 
     depends_on("dyninst@develop", when='@develop')
     depends_on("dyninst@10:", when='@2.3.1.3:9999')
 
     depends_on("python", when='@develop', type=('build', 'run'))
-    depends_on("python@2.7.14:2.7.15", when='@2.3.1.3:9999', type=('build', 'run'))
+    depends_on("python@2.7.14:2.7.99", when='@2.3.1.3:9999', type=('build', 'run'))
 
     depends_on("libxml2")
 
@@ -279,7 +280,7 @@ class OpenspeedshopUtils(CMakePackage):
                                         shared=True, recursive=True)
 
         # Set Dyninst RT library path to support OSS loop resolution code
-        run_env.set('DYNINSTAPI_RT_LIB', dyninst_libdir)
+        run_env.set('DYNINSTAPI_RT_LIB', dyninst_libdir[0])
 
         # Find openspeedshop library path
         oss_libdir = find_libraries(
diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py
index 991c98f304..df737b2fb1 100644
--- a/var/spack/repos/builtin/packages/openspeedshop/package.py
+++ b/var/spack/repos/builtin/packages/openspeedshop/package.py
@@ -27,6 +27,7 @@ class Openspeedshop(CMakePackage):
     git      = "https://github.com/OpenSpeedShop/openspeedshop.git"
 
     version('develop', branch='master')
+    version('2.4.1', branch='2.4.1')
     version('2.4.0', branch='2.4.0')
     version('2.3.1.5', branch='2.3.1.5')
     version('2.3.1.4', branch='2.3.1.4')
@@ -86,7 +87,8 @@ class Openspeedshop(CMakePackage):
     depends_on("sqlite")
 
     # For boost
-    depends_on("boost@1.66.0:")
+    # depends_on("boost@1.66.0:")
+    depends_on("boost@1.66.0:1.69.0")
 
     depends_on("dyninst@develop", when='@develop')
     depends_on("dyninst@10:", when='@2.3.1.3:9999')
@@ -288,7 +290,7 @@ class Openspeedshop(CMakePackage):
                                         shared=True, recursive=True)
 
         # Set Dyninst RT library path to support OSS loop resolution code
-        run_env.set('DYNINSTAPI_RT_LIB', dyninst_libdir)
+        run_env.set('DYNINSTAPI_RT_LIB', dyninst_libdir[0])
 
         run_env.set('OPENSS_RAWDATA_DIR', '.')
 
diff --git a/var/spack/repos/builtin/packages/qtgraph/package.py b/var/spack/repos/builtin/packages/qtgraph/package.py
index b0d7d66dd6..3d4a7307eb 100644
--- a/var/spack/repos/builtin/packages/qtgraph/package.py
+++ b/var/spack/repos/builtin/packages/qtgraph/package.py
@@ -20,8 +20,7 @@ class Qtgraph(QMakePackage):
     version('1.0.0.0', branch='1.0.0.0')
 
     # qtgraph depends on these packages
-    depends_on('qt@4.8.6:', when='@develop')
-    depends_on('qt@5.10.0', when='@1.0.0.0:')
+    depends_on('qt@5.10.0:', when='@1.0.0.0:')
 
     depends_on("graphviz@2.40.1:", when='@develop')
     depends_on("graphviz@2.40.1", when='@1.0.0.0:')