diff options
| author | Ben Morgan <drbenmorgan@users.noreply.github.com> | 2019-02-20 09:55:09 +0000 |
|---|---|---|
| committer | Javier Cervantes <javiercvilla@gmail.com> | 2019-02-20 10:55:09 +0100 |
| commit | fb6a2b5cabe284ecac5088c94fb2dba36f4a7e2e (patch) | |
| tree | e6d024b5555313193926ea53aed59f9e0dfa3575 | |
| parent | 286da7f47b67d64f32336eaf741a3a182176b592 (diff) | |
| download | spack-fb6a2b5cabe284ecac5088c94fb2dba36f4a7e2e.tar.gz spack-fb6a2b5cabe284ecac5088c94fb2dba36f4a7e2e.tar.bz2 spack-fb6a2b5cabe284ecac5088c94fb2dba36f4a7e2e.tar.xz spack-fb6a2b5cabe284ecac5088c94fb2dba36f4a7e2e.zip | |
xxhash: edit prefix in Makefile for macOS (#10606)
On macOS, the build of libxxhash is performed by a bare `make`
launched by `MakePackage`s default `build` phase. As `prefix`
is not set at this point, the library gets compiled with a hard-coded
install name of `/usr/local/libxxhash.dylib`. Downstream clients,
in the tested case Root, will then fail to build as the install name
is incorrect.
Move setting of `prefix` from `install` to `edit` so that it
propagates to subsequent `build` and `install` phases.
| -rw-r--r-- | var/spack/repos/builtin/packages/xxhash/package.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/xxhash/package.py b/var/spack/repos/builtin/packages/xxhash/package.py index e2fcfbb731..cb8e37bfaa 100644 --- a/var/spack/repos/builtin/packages/xxhash/package.py +++ b/var/spack/repos/builtin/packages/xxhash/package.py @@ -26,5 +26,6 @@ class Xxhash(MakefilePackage): version('0.5.1', '9417fd8a4d88204b680e21a60f0ccada') version('0.5.0', '42e9a31a2cfc2f626fde17e84a0b6bb7') - def install(self, spec, prefix): - make('prefix={0}'.format(prefix), 'install') + def edit(self, spec, prefix): + makefile = FileFilter("Makefile") + makefile.filter('/usr/local', prefix) |