diff options
| author | Harmen Stoppels <harmenstoppels@gmail.com> | 2022-04-08 09:28:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-08 09:28:31 +0200 |
| commit | b667be470e6f3f598c72e1107b07057e8529c86c (patch) | |
| tree | fc03183c4b7c1282223eb43ebcb7cb3f87d60e19 /var | |
| parent | 99425e273b79796b87168a2c37cbb37e2ff19028 (diff) | |
| download | spack-b667be470e6f3f598c72e1107b07057e8529c86c.tar.gz spack-b667be470e6f3f598c72e1107b07057e8529c86c.tar.bz2 spack-b667be470e6f3f598c72e1107b07057e8529c86c.tar.xz spack-b667be470e6f3f598c72e1107b07057e8529c86c.zip | |
zstd: improve %nvhpc conflict (#29867)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/zstd/package.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/zstd/package.py b/var/spack/repos/builtin/packages/zstd/package.py index e1daec856b..9b82773eb2 100644 --- a/var/spack/repos/builtin/packages/zstd/package.py +++ b/var/spack/repos/builtin/packages/zstd/package.py @@ -38,12 +38,22 @@ class Zstd(MakefilePackage): depends_on('lz4', when='+programs') depends_on('xz', when='+programs') - conflicts('%nvhpc') + # +programs builds vendored xxhash, which uses unsupported builtins + # (last tested: nvhpc@22.3) + conflicts('+programs %nvhpc') def _make(self, *args, **kwargs): # PREFIX must be defined on macOS even when building the library, since # it gets hardcoded into the library's install_path - make('VERBOSE=1', 'PREFIX=' + self.prefix, '-C', *args, **kwargs) + def_args = ['VERBOSE=1', 'PREFIX=' + self.prefix] + + # Tested %nvhpc@22.3. No support for -MP + if '%nvhpc' in self.spec: + def_args.append('DEPFLAGS=-MT $@ -MMD -MF') + + def_args.append('-C') + def_args.extend(args) + make(*def_args, **kwargs) def build(self, spec, prefix): self._make('lib') |