zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

herwig3, thepeg: correct lhapdfsets dependency, specify boost libs (#31744)

Browse Source 
* 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
This commit is contained in:
Valentin Volkl 2022-07-27 19:23:03 +02:00 committed by GitHub
parent 56ab4c9820
commit 850b295ec5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
var/spack/repos/builtin/packages/herwig3/package.py
View File

@ -4,7 +4,6 @@
# SPDX-License-Identifier: (Apache-2.0 OR MIT) # SPDX-License-Identifier: (Apache-2.0 OR MIT)
from spack.package import * from spack.package import *
from spack.pkg.builtin.boost import Boost
class Herwig3(AutotoolsPackage): class Herwig3(AutotoolsPackage):
@ -23,15 +22,12 @@ class Herwig3(AutotoolsPackage):
depends_on('libtool', type='build') depends_on('libtool', type='build')
depends_on('m4', type='build') depends_on('m4', type='build')
depends_on('lhapdf') 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.1', when='@7.2.1')
depends_on('thepeg@2.2.3', when='@7.2.3') depends_on('thepeg@2.2.3', when='@7.2.3')
depends_on('evtgen') depends_on('evtgen')
# TODO: replace this with an explicit list of components of Boost, depends_on('boost +math+test')
# for instance depends_on('boost +filesystem')
# See https://github.com/spack/spack/pull/22303 for reference
depends_on(Boost.with_default_variants)
depends_on('python', type=('build', 'run')) depends_on('python', type=('build', 'run'))
depends_on('gsl') depends_on('gsl')
depends_on('fastjet') depends_on('fastjet')

8
var/spack/repos/builtin/packages/thepeg/package.py
View File

@ -4,7 +4,6 @@
# SPDX-License-Identifier: (Apache-2.0 OR MIT) # SPDX-License-Identifier: (Apache-2.0 OR MIT)
from spack.package import * from spack.package import *
from spack.pkg.builtin.boost import Boost
class Thepeg(AutotoolsPackage): 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') conflicts('hepmc=3', when='@:2.1', msg='HepMC3 support was added in 2.2.0')
depends_on('fastjet', when='@2.0.0:') depends_on('fastjet', when='@2.0.0:')
depends_on('rivet', when='@2.0.3:') depends_on('rivet', when='@2.0.3:')
depends_on('boost', when='@2.1.1:') depends_on('boost +test', 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('autoconf', type='build') depends_on('autoconf', type='build')
depends_on('automake', type='build') depends_on('automake', type='build')