diff options
| author | Valentin Volkl <valentin.volkl@cern.ch> | 2022-03-20 21:18:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-20 14:18:12 -0600 |
| commit | 6611f0bf4b657543f29f2d62adc396ca33393ee5 (patch) | |
| tree | cbfbb060f6b649d55c9ede1975ba31fe98e3fbab /var | |
| parent | 3d6156d3b2358aa759638afda5e18fb885b2ec3d (diff) | |
| download | spack-6611f0bf4b657543f29f2d62adc396ca33393ee5.tar.gz spack-6611f0bf4b657543f29f2d62adc396ca33393ee5.tar.bz2 spack-6611f0bf4b657543f29f2d62adc396ca33393ee5.tar.xz spack-6611f0bf4b657543f29f2d62adc396ca33393ee5.zip | |
rivet: fix dependency build types (#29358)
* 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
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/rivet/package.py | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/var/spack/repos/builtin/packages/rivet/package.py b/var/spack/repos/builtin/packages/rivet/package.py index 3b8b1783ea..207a31a22b 100644 --- a/var/spack/repos/builtin/packages/rivet/package.py +++ b/var/spack/repos/builtin/packages/rivet/package.py @@ -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 @@ class Rivet(AutotoolsPackage): 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': |