diff options
6 files changed, 16 insertions, 16 deletions
diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py index 06e752d199..3d8572232c 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py @@ -54,11 +54,11 @@ class CbtfArgonavis(Package): # url = "file:/home/jeg/OpenSpeedShop_ROOT/SOURCES/cbtf-argonavis-1.6.tar.gz" # version('1.6', '0fafa0008478405c2c2319450f174ed4') - version('1.6', branch='master', + version('1.8', branch='master', git='https://github.com/OpenSpeedShop/cbtf-argonavis.git') depends_on("cmake@3.0.2:", type='build') - depends_on("boost@1.50.0:") + depends_on("boost@1.50.0:1.59.0") depends_on("papi") depends_on("mrnet@5.0.1:+lwthreads") depends_on("cbtf") diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index efcd7200d8..3f36942e9a 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -56,7 +56,7 @@ class CbtfKrell(Package): # url = "file:/home/jeg/cbtf-krell-1.6.tar.gz" # version('1.6', 'edeb61cd488f16e7b124f77db9ce762d') - version('1.6', branch='master', + version('1.8', branch='master', git='https://github.com/OpenSpeedShop/cbtf-krell.git') # MPI variants @@ -80,8 +80,8 @@ class CbtfKrell(Package): depends_on("binutils@2.24+krellpatch") # collectionTool - depends_on("boost@1.50.0:") - depends_on("dyninst@8.2.1:") + depends_on("boost@1.50.0:1.59.0") + depends_on("dyninst@9.2.0") depends_on("mrnet@5.0.1:+lwthreads") depends_on("xerces-c@3.1.1:") diff --git a/var/spack/repos/builtin/packages/cbtf-lanl/package.py b/var/spack/repos/builtin/packages/cbtf-lanl/package.py index 2b4e887325..1545c7bf8b 100644 --- a/var/spack/repos/builtin/packages/cbtf-lanl/package.py +++ b/var/spack/repos/builtin/packages/cbtf-lanl/package.py @@ -49,10 +49,10 @@ class CbtfLanl(Package): homepage = "http://sourceforge.net/p/cbtf/wiki/Home/" # Mirror access template example - # url = "file:/g/g24/jeg/cbtf-lanl-1.5.tar.gz" - # version('1.5', 'c3f78f967b0a42c6734ce4be0e602426') + # url = "file:/g/g24/jeg/cbtf-lanl-1.6.tar.gz" + # version('1.6', 'c3f78f967b0a42c6734ce4be0e602426') - version('1.6', branch='master', + version('1.8', branch='master', git='http://git.code.sf.net/p/cbtf-lanl/cbtf-lanl') depends_on("cmake@3.0.2:", type='build') diff --git a/var/spack/repos/builtin/packages/cbtf/package.py b/var/spack/repos/builtin/packages/cbtf/package.py index a711a918ca..7c9626c90e 100644 --- a/var/spack/repos/builtin/packages/cbtf/package.py +++ b/var/spack/repos/builtin/packages/cbtf/package.py @@ -57,14 +57,14 @@ class Cbtf(Package): # version('1.6', 'c1ef4e5aa4e470dffb042abdba0b9987') # Use when the git repository is available - version('1.6', branch='master', + version('1.8', branch='master', git='https://github.com/OpenSpeedShop/cbtf.git') variant('runtime', default=False, description="build only the runtime libraries and collectors.") depends_on("cmake@3.0.2:", type='build') - depends_on("boost@1.50.0:") + depends_on("boost@1.50.0:1.59.0") depends_on("mrnet@5.0.1:+lwthreads") depends_on("xerces-c@3.1.1:") # Work around for spack libxml2 package bug, take off python when fixed diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index c9707f760c..2e908b4099 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -63,12 +63,12 @@ class Openspeedshop(Package): url = "https://github.com/OpenSpeedShop" version('2.2', '16cb051179c2038de4e8a845edf1d573') # Use when the git repository is available - version('2.2', branch='master', + version('2.3', branch='master', git='https://github.com/OpenSpeedShop/openspeedshop.git') # Optional mirror template - # url = "file:/home/jeg/OpenSpeedShop_ROOT/SOURCES/openspeedshop-2.2.tar.gz" - # version('2.2', '517a7798507241ad8abd8b0626a4d2cf') + # url = "file:/home/jeg/OpenSpeedShop_ROOT/SOURCES/openspeedshop-2.3.tar.gz" + # version('2.3', '517a7798507241ad8abd8b0626a4d2cf') parallel = False @@ -118,8 +118,8 @@ class Openspeedshop(Package): depends_on("libelf") depends_on("libdwarf") depends_on("sqlite") - depends_on("boost@1.50.0:") - depends_on("dyninst@9.1.0:") + depends_on("boost@1.50.0:1.59.0") + depends_on("dyninst@9.2.0") depends_on("libxml2+python") depends_on("qt@3.3.8b+krellpatch") diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index d815add9f0..95698018fa 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -64,7 +64,7 @@ class Qt(Package): # Use system openssl for security. depends_on("openssl") - depends_on("glib") + depends_on("glib", when='@4:') depends_on("gtkplus", when='+gtk') depends_on("libxml2") depends_on("zlib") |