From 5a22611c33290d382d24dc6ce6de16dd2889529c Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 3 Jul 2018 09:27:27 -0700 Subject: macOS: we no longer need libssh2 Signed-off-by: Dirk Hohndel --- packaging/macosx/make-package.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/macosx/make-package.sh b/packaging/macosx/make-package.sh index e1da0fc75..efcce705e 100755 --- a/packaging/macosx/make-package.sh +++ b/packaging/macosx/make-package.sh @@ -36,14 +36,14 @@ for i in libgit2 libGrantlee_TextDocument.dylib libGrantlee_Templates.dylib; do if [[ "$i" = "libgit2" ]] ; then CURLLIB=$(otool -L Subsurface.app/Contents/Frameworks/${SONAME} | grep libcurl | cut -d\ -f1 | tr -d "\t") install_name_tool -change ${CURLLIB} @executable_path/../Frameworks/$(basename ${CURLLIB}) Subsurface.app/Contents/Frameworks/${SONAME} - SSHLIB=$(otool -L Subsurface.app/Contents/Frameworks/${SONAME} | grep libssh2 | cut -d\ -f1 | tr -d "\t") - install_name_tool -change ${SSHLIB} @executable_path/../Frameworks/$(basename ${SSHLIB}) Subsurface.app/Contents/Frameworks/${SONAME} + # SSHLIB=$(otool -L Subsurface.app/Contents/Frameworks/${SONAME} | grep libssh2 | cut -d\ -f1 | tr -d "\t") + # install_name_tool -change ${SSHLIB} @executable_path/../Frameworks/$(basename ${SSHLIB}) Subsurface.app/Contents/Frameworks/${SONAME} fi fi done # next, copy libssh2.1 -cp ${DIR}/install-root/lib/libssh2.1.dylib Subsurface.app/Contents/Frameworks +# cp ${DIR}/install-root/lib/libssh2.1.dylib Subsurface.app/Contents/Frameworks # next, replace @rpath references with @executable_path references in Subsurface RPATH=$(otool -L ${EXECUTABLE} | grep rpath | cut -d\ -f1 | tr -d "\t" | cut -b 8- ) -- cgit v1.2.3-70-g09d2