From 481bc91854219a4b7a65de85e2025e20c7ec23c8 Mon Sep 17 00:00:00 2001 From: Jim Galarowicz Date: Tue, 10 Jan 2017 12:28:05 -0800 Subject: Update the boost versions used by openspeedshop. Boost-1.60 to current latest causes compile errors when building openspeedshop. (#2300) * Update the krell institute products to use the latest features of spack for building on cluster platforms. * Address travis error messages and resubmit the pull request. * Update the contents of openspeedshop package.py so it passes the flake8 tests. * Fix flake8 error-whitespack issue in mrnet package.py file. * Add updates based on spack reviewer feedback. * More fixes based on comments from reviewers. Switch using extend to using append, remove additional setting of PATH and LD_LIBRARY_PATH that should not be required due to RPATH. * More review related changes. Update MPIOption.append lines and take out xercesc references. * Create a base options function for common openspeedshop base cmake options to reduce redundencies. * Add libxml2+python depends on to get around issues with the libxml2 package file. * Using boost over 1.60.0 causes compile errors. This is a known boost bug. Also, dyninst-9.2.0 is set to be the vesrion of dyninst to use with OSS, as of now. The newer version fails to build. * Fix bad syntax in specifying the boost version range. * Update the version numbers for the krell institute components and tools: cbtf and openspeedshop. * Do not build glib for qt3, it is not needed and causes build problems at this time anyway. --- var/spack/repos/builtin/packages/cbtf-argonavis/package.py | 4 ++-- var/spack/repos/builtin/packages/cbtf-krell/package.py | 6 +++--- var/spack/repos/builtin/packages/cbtf-lanl/package.py | 6 +++--- var/spack/repos/builtin/packages/cbtf/package.py | 4 ++-- var/spack/repos/builtin/packages/openspeedshop/package.py | 10 +++++----- var/spack/repos/builtin/packages/qt/package.py | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) (limited to 'var') 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") -- cgit v1.2.3-70-g09d2