From 3181021c11148ff86efa1a7830157b5f7ef9378d Mon Sep 17 00:00:00 2001 From: Matthieu Dorier Date: Wed, 4 Sep 2019 15:25:00 +0100 Subject: 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 --- var/spack/repos/builtin/packages/boost/package.py | 14 +++++++------- 1 file 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') -- cgit v1.2.3-70-g09d2