summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorMatthieu Dorier <mdorier@anl.gov>2019-09-04 15:25:00 +0100
committerAdam J. Stewart <ajstewart426@gmail.com>2019-09-04 09:25:00 -0500
commit3181021c11148ff86efa1a7830157b5f7ef9378d (patch)
tree1d3dadc379d93324c152264a9ec35547339ba493 /var
parentd7ef97392c1161c6ec588ebdf7ca14c2a6fce942 (diff)
downloadspack-3181021c11148ff86efa1a7830157b5f7ef9378d.tar.gz
spack-3181021c11148ff86efa1a7830157b5f7ef9378d.tar.bz2
spack-3181021c11148ff86efa1a7830157b5f7ef9378d.tar.xz
spack-3181021c11148ff86efa1a7830157b5f7ef9378d.zip
Boost: fixed problem when requesting ~signals for boost >= 1.69 (#12627)
* fixed problem when requesting ~signals for boost >= 1.69 * added checks for all libs in with_libs
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/boost/package.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py
index 583f550bc6..4d4615cb28 100644
--- a/var/spack/repos/builtin/packages/boost/package.py
+++ b/var/spack/repos/builtin/packages/boost/package.py
@@ -390,19 +390,19 @@ class Boost(Package):
return
# Remove libraries that the release version does not support
- if spec.satisfies('@1.69.0:'):
+ if spec.satisfies('@1.69.0:') and 'signals' in with_libs:
with_libs.remove('signals')
- if not spec.satisfies('@1.54.0:'):
+ if not spec.satisfies('@1.54.0:') and 'log' in with_libs:
with_libs.remove('log')
- if not spec.satisfies('@1.53.0:'):
+ if not spec.satisfies('@1.53.0:') and 'atomic' in with_libs:
with_libs.remove('atomic')
- if not spec.satisfies('@1.48.0:'):
+ if not spec.satisfies('@1.48.0:') and 'locale' in with_libs:
with_libs.remove('locale')
- if not spec.satisfies('@1.47.0:'):
+ if not spec.satisfies('@1.47.0:') and 'chrono' in with_libs:
with_libs.remove('chrono')
- if not spec.satisfies('@1.43.0:'):
+ if not spec.satisfies('@1.43.0:') and 'random' in with_libs:
with_libs.remove('random')
- if not spec.satisfies('@1.39.0:'):
+ if not spec.satisfies('@1.39.0:') and 'exception' in with_libs:
with_libs.remove('exception')
if '+graph' in spec and '+mpi' in spec:
with_libs.append('graph_parallel')