From b7c31cb5616c5637512d8fb5599393dec374ffb1 Mon Sep 17 00:00:00 2001 From: Chuck Atkins Date: Tue, 29 Jan 2019 12:13:46 -0500 Subject: rhash: Fix broken RPATH info on darwin The PREFIX variable in the makefiles is directly used to construct the install name on the library metadata on darwin. If not passed, the default /usr/local is used and the resulting librhash.dylib contains usage informaiton of /usr/local/lib/librhash.0.dylib. This adds the PREFIX= variable directly to the make command so the resulting usage metadata contains the correct valid library path. --- var/spack/repos/builtin/packages/rhash/package.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/rhash/package.py b/var/spack/repos/builtin/packages/rhash/package.py index 5a5aaa9b8c..29ad1859cf 100644 --- a/var/spack/repos/builtin/packages/rhash/package.py +++ b/var/spack/repos/builtin/packages/rhash/package.py @@ -23,12 +23,12 @@ class Rhash(MakefilePackage): def build(self, spec, prefix): # Doesn't build shared libraries by default - make() + make('PREFIX={0}'.format(prefix)) if spec.satisfies('platform=darwin'): - make('-C', 'librhash', 'dylib') + make('PREFIX={0}'.format(prefix), '-C', 'librhash', 'dylib') else: - make('lib-shared') + make('PREFIX={0}'.format(prefix), 'lib-shared') def check(self): # Makefile has both `test` and `check` targets: -- cgit v1.2.3-70-g09d2