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

rivet: fix dependency build types (#29358)

Browse Source 
* rivet: fix dependency build types

If it isn't a python package, there is no good reason to change the default build type to remove link

* rivet: turn swig into build dependency
This commit is contained in:
Valentin Volkl 2022-03-20 21:18:12 +01:00 committed by GitHub
parent 3d6156d3b2
commit 6611f0bf4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
var/spack/repos/builtin/packages/rivet/package.py
View File

@ -107,21 +107,20 @@ class Rivet(AutotoolsPackage):
depends_on('yoda@1.7.0:1.7', when='@2.6.0,2.7.0,2.7.1,3.0.0,3.0.2')
depends_on('yoda@1.5.0:1.5', when='@2.4.1')
depends_on('hepmc', type=('build', 'link', 'run'), when='hepmc=2')
depends_on('hepmc3', type=('build', 'link', 'run'), when='hepmc=3')
depends_on('boost', when='@:2.5.0', type=('build', 'run'))
depends_on('hepmc', when='hepmc=2')
depends_on('hepmc3', when='hepmc=3')
depends_on('boost', when='@:2.5.0')
# 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, when='@:2.5.0', type=('build', 'run'))
depends_on('fastjet', type=('build', 'run'))
depends_on('fjcontrib', type=('build', 'run'), when='@3.0.0:')
depends_on('gsl', type=('build', 'run'), when='@:2.6.0,2.6.2:2')
depends_on(Boost.with_default_variants, when='@:2.5.0')
depends_on('fastjet')
depends_on('fjcontrib', when='@3.0.0:')
depends_on('gsl', when='@:2.6.0,2.6.2:2')
depends_on('python', type=('build', 'run'))
depends_on('py-cython@0.24.0:', type='build')
depends_on('swig', type=('build', 'run'))
depends_on('yaml-cpp', when='@2.0.0:2.1.2', type=('build', 'run'))
depends_on('swig', type='build')
depends_on('yaml-cpp', when='@2.0.0:2.1.2')
depends_on('autoconf', type='build')
depends_on('automake', type='build')
@ -160,8 +159,6 @@ def force_autoreconf(self):
def setup_build_environment(self, env):
# this avoids an "import site" error in the build
env.unset('PYTHONHOME')
fjcontrib_home = self.spec['fjcontrib'].prefix
env.prepend_path('LD_LIBRARY_PATH', fjcontrib_home.lib)
def flag_handler(self, name, flags):
if self.spec.satisfies('@3.1.2:') and name == 'cxxflags':