diff options
| author | Kelly (KT) Thompson <kgt@lanl.gov> | 2016-04-05 13:31:06 -0600 |
|---|---|---|
| committer | Kelly (KT) Thompson <kgt@lanl.gov> | 2016-04-05 13:31:06 -0600 |
| commit | 340ad44aab649d485a9c1eafe531a2ce59890bc0 (patch) | |
| tree | 510d41878634b2346c0a9c1fe89c6b10e3ff9411 /var | |
| parent | 21ad5162c41b75aa11a5622a58a022a3107e6990 (diff) | |
| parent | 8ef9d685427e60ce5af660be5f27d36683ea8845 (diff) | |
| download | spack-340ad44aab649d485a9c1eafe531a2ce59890bc0.tar.gz spack-340ad44aab649d485a9c1eafe531a2ce59890bc0.tar.bz2 spack-340ad44aab649d485a9c1eafe531a2ce59890bc0.tar.xz spack-340ad44aab649d485a9c1eafe531a2ce59890bc0.zip | |
Merge remote-tracking branch 'upstream/develop' into pkg-exuberant-ctags
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/boost/package.py | 12 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/dyninst/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/package.py | 1 |
3 files changed, 14 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index f889da21f2..12bc9508c3 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -199,6 +199,18 @@ class Boost(Package): install_tree(src, dst) return + # Remove libraries that the release version does not support + if not spec.satisfies('@1.54.0:'): + withLibs.remove('log') + if not spec.satisfies('@1.53.0:'): + withLibs.remove('atomic') + if not spec.satisfies('@1.48.0:'): + withLibs.remove('locale') + if not spec.satisfies('@1.47.0:'): + withLibs.remove('chrono') + if not spec.satisfies('@1.43.0:'): + withLibs.remove('random') + # to make Boost find the user-config.jam env['BOOST_BUILD_PATH'] = './' diff --git a/var/spack/repos/builtin/packages/dyninst/package.py b/var/spack/repos/builtin/packages/dyninst/package.py index 0111dcbe08..b28e897a0f 100644 --- a/var/spack/repos/builtin/packages/dyninst/package.py +++ b/var/spack/repos/builtin/packages/dyninst/package.py @@ -31,6 +31,8 @@ class Dyninst(Package): url = "http://www.dyninst.org/sites/default/files/downloads/dyninst/8.1.2/DyninstAPI-8.1.2.tgz" list_url = "http://www.dyninst.org/downloads/dyninst-8.x" + version('9.1.0', '5c64b77521457199db44bec82e4988ac', + url="http://www.paradyn.org/release9.1.0/DyninstAPI-9.1.0.tgz") version('8.2.1', 'abf60b7faabe7a2e4b54395757be39c7', url="http://www.paradyn.org/release8.2/DyninstAPI-8.2.1.tgz") version('8.1.2', 'bf03b33375afa66fe0efa46ce3f4b17a', diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index ab09469042..8cb88e6c85 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -4,7 +4,6 @@ import os class Qt(Package): """Qt is a comprehensive cross-platform C++ application framework.""" homepage = 'http://qt.io' - url = 'http://download.qt.io/archive/qt/5.5/5.5.1/single/qt-everywhere-opensource-src-5.5.1.tar.gz' version('5.5.1', '59f0216819152b77536cf660b015d784') version('5.4.2', 'fa1c4d819b401b267eb246a543a63ea5') |