From 850b295ec50890b5485ce15d37be8e9301f9eb6c Mon Sep 17 00:00:00 2001 From: Valentin Volkl Date: Wed, 27 Jul 2022 19:23:03 +0200 Subject: herwig3, thepeg: correct lhapdfsets dependency, specify boost libs (#31744) * herwig3: change lhapdfsets dependency type to build These data sets are needed for a check during build, but due to the difficulty of versioning the datasets it is preferred not to keep the them in the run environment. * herwig3: explicitly state needed boost libs * thepeg: explicitly state needed boost libs * style * stylestyle --- var/spack/repos/builtin/packages/herwig3/package.py | 8 ++------ var/spack/repos/builtin/packages/thepeg/package.py | 8 +------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/var/spack/repos/builtin/packages/herwig3/package.py b/var/spack/repos/builtin/packages/herwig3/package.py index e2913e4ca7..ba2f1dd1fe 100644 --- a/var/spack/repos/builtin/packages/herwig3/package.py +++ b/var/spack/repos/builtin/packages/herwig3/package.py @@ -4,7 +4,6 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack.package import * -from spack.pkg.builtin.boost import Boost class Herwig3(AutotoolsPackage): @@ -23,15 +22,12 @@ class Herwig3(AutotoolsPackage): depends_on('libtool', type='build') depends_on('m4', type='build') depends_on('lhapdf') - depends_on('lhapdfsets') + depends_on('lhapdfsets', type='build') depends_on('thepeg@2.2.1', when='@7.2.1') depends_on('thepeg@2.2.3', when='@7.2.3') depends_on('evtgen') - # TODO: replace this with an explicit list of components of Boost, - # for instance depends_on('boost +filesystem') - # See https://github.com/spack/spack/pull/22303 for reference - depends_on(Boost.with_default_variants) + depends_on('boost +math+test') depends_on('python', type=('build', 'run')) depends_on('gsl') depends_on('fastjet') diff --git a/var/spack/repos/builtin/packages/thepeg/package.py b/var/spack/repos/builtin/packages/thepeg/package.py index c817f8c976..e952bfac54 100644 --- a/var/spack/repos/builtin/packages/thepeg/package.py +++ b/var/spack/repos/builtin/packages/thepeg/package.py @@ -4,7 +4,6 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack.package import * -from spack.pkg.builtin.boost import Boost class Thepeg(AutotoolsPackage): @@ -67,12 +66,7 @@ class Thepeg(AutotoolsPackage): conflicts('hepmc=3', when='@:2.1', msg='HepMC3 support was added in 2.2.0') depends_on('fastjet', when='@2.0.0:') depends_on('rivet', when='@2.0.3:') - depends_on('boost', when='@2.1.1:') - - # TODO: replace this with an explicit list of components of Boost, - # for instance depends_on('boost +filesystem') - # See https://github.com/spack/spack/pull/22303 for reference - depends_on(Boost.with_default_variants) + depends_on('boost +test', when='@2.1.1:') depends_on('autoconf', type='build') depends_on('automake', type='build') -- cgit v1.2.3-60-g2f50