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

zstd: fix install name on macOS (#26518)

Browse Source 
Reverting from CMake to Make install caused
`-install_path=/usr/local/lib/libzstd.1.dylib` to be hardcoded into the
zstd. Now we explicitly pass the PREFIX into the build command so that
the correct spack install path is saved.

Fixes #26438 and also the ROOT install issue I had :)
This commit is contained in:
Seth R. Johnson 2021-10-04 22:03:48 -04:00 committed by GitHub
parent b5673d70de
commit 3cf426df99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
var/spack/repos/builtin/packages/zstd/package.py
View File

@ -37,12 +37,17 @@ class Zstd(MakefilePackage):
depends_on('lzma', when='+programs')
depends_on('lz4', when='+programs')
def _make(self, *args):
# 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)
def build(self, spec, prefix):
make('-C', 'lib')
self._make('lib')
if spec.variants['programs'].value:
make('-C', 'programs')
self._make('programs')
def install(self, spec, prefix):
make('-C', 'lib', 'install', 'PREFIX={0}'.format(prefix))
self._make('lib', 'install')
if spec.variants['programs'].value:
make('-C', 'programs', 'install', 'PREFIX={0}'.format(prefix))
self._make('programs', 'install')