diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2020-04-14 17:10:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-14 17:10:45 -0500 |
| commit | 69f7bae8fe404a2dd92a5c08efa92969fe8531df (patch) | |
| tree | 936270ddcb0a2e37aaed34ae194a206cc63ed823 | |
| parent | cba5f71eee154524572f1e0f071af7e52016feea (diff) | |
| download | spack-69f7bae8fe404a2dd92a5c08efa92969fe8531df.tar.gz spack-69f7bae8fe404a2dd92a5c08efa92969fe8531df.tar.bz2 spack-69f7bae8fe404a2dd92a5c08efa92969fe8531df.tar.xz spack-69f7bae8fe404a2dd92a5c08efa92969fe8531df.zip | |
libssh2: fix linking on macOS (#16012)
* libssh2: fix linking on macOS
* Fix libgit2 linkage to libssh2
| -rw-r--r-- | var/spack/repos/builtin/packages/libgit2/package.py | 1 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/libssh2/package.py | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/libgit2/package.py b/var/spack/repos/builtin/packages/libgit2/package.py index dcd5259a27..6fe9022179 100644 --- a/var/spack/repos/builtin/packages/libgit2/package.py +++ b/var/spack/repos/builtin/packages/libgit2/package.py @@ -57,6 +57,7 @@ class Libgit2(CMakePackage): # Build Dependencies depends_on('cmake@2.8:', type='build', when="@:0.28") depends_on('cmake@3.5:', type='build', when="@0.99:") + depends_on('pkgconfig', type='build') # Runtime Dependencies depends_on('libssh2', when='+ssh') diff --git a/var/spack/repos/builtin/packages/libssh2/package.py b/var/spack/repos/builtin/packages/libssh2/package.py index 3cada3de90..cb3bcab1c3 100644 --- a/var/spack/repos/builtin/packages/libssh2/package.py +++ b/var/spack/repos/builtin/packages/libssh2/package.py @@ -28,3 +28,9 @@ class Libssh2(CMakePackage): spec = self.spec return [ '-DBUILD_SHARED_LIBS=%s' % ('YES' if '+shared' in spec else 'NO')] + + @run_after('install') + def darwin_fix(self): + # The shared library is not installed correctly on Darwin; fix this + if self.spec.satisfies('platform=darwin'): + fix_darwin_install_name(self.prefix.lib) |