diff options
| author | Seth R. Johnson <johnsonsr@ornl.gov> | 2021-10-18 13:34:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-18 13:34:16 -0400 |
| commit | c48b733773efdb54d582a46e81d934adc8cd4c95 (patch) | |
| tree | 3df62d46760b3d1621cc8fb62317908b92d3d552 /var | |
| parent | 3c013b5be6775c7c337fda596119499d8c624ba7 (diff) | |
| download | spack-c48b733773efdb54d582a46e81d934adc8cd4c95.tar.gz spack-c48b733773efdb54d582a46e81d934adc8cd4c95.tar.bz2 spack-c48b733773efdb54d582a46e81d934adc8cd4c95.tar.xz spack-c48b733773efdb54d582a46e81d934adc8cd4c95.zip | |
Make macOS installed libraries more relocatable (#26608)
* relocate: call install_name_tool less
* zstd: fix race condition
Multiple times on my mac, trying to install in parallel led to failures
from multiple tasks trying to simultaneously create `$PREFIX/lib`.
* PackageMeta: simplify callback flush
* Relocate: use spack.platforms instead of platform
* Relocate: code improvements
* fix zstd
* Automatically fix rpaths for packages on macOS
* Only change library IDs when the path is already in the rpath
This restores the hardcoded library path for GCC.
* Delete nonexistent rpaths and add more testing
* Relocate: Allow @executable_path and @loader_path
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/zstd/package.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/zstd/package.py b/var/spack/repos/builtin/packages/zstd/package.py index 299ff0790f..9f35a34af0 100644 --- a/var/spack/repos/builtin/packages/zstd/package.py +++ b/var/spack/repos/builtin/packages/zstd/package.py @@ -37,10 +37,10 @@ class Zstd(MakefilePackage): depends_on('lzma', when='+programs') depends_on('lz4', when='+programs') - def _make(self, *args): + 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) + make('VERBOSE=1', 'PREFIX=' + self.prefix, '-C', *args, **kwargs) def build(self, spec, prefix): self._make('lib') @@ -48,6 +48,6 @@ class Zstd(MakefilePackage): self._make('programs') def install(self, spec, prefix): - self._make('lib', 'install') + self._make('lib', 'install', parallel=False) if spec.variants['programs'].value: self._make('programs', 'install') |