diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-07-04 01:36:25 +0900 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-07-04 01:45:55 +0900 |
| commit | 6bba524288853df0e61bf865ef4c248b57576ee7 (patch) | |
| tree | e0c9c56b78ef829d347e4ff85f238e590526c41a /packaging | |
| parent | 9c0cc531755b45859c88f12e661076a9e4310def (diff) | |
| download | subsurface-6bba524288853df0e61bf865ef4c248b57576ee7.tar.gz | |
Mac package build: adjust handling of libgit2
Apparently it now is a different dependency that causes problems.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/macosx/make-package.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packaging/macosx/make-package.sh b/packaging/macosx/make-package.sh index 46ca5b599..2e94c050f 100755 --- a/packaging/macosx/make-package.sh +++ b/packaging/macosx/make-package.sh @@ -25,15 +25,15 @@ EXECUTABLE=Subsurface.app/Contents/MacOS/Subsurface for i in libssh libssrfmarblewidget libgit2 libGrantlee_TextDocument.dylib libGrantlee_Templates.dylib; do OLD=$(otool -L ${EXECUTABLE} | grep $i | cut -d\ -f1 | tr -d "\t") if [ ! -z ${OLD} ] ; then + # copy the library into the bundle and make sure its id and the reference to it are correct cp ${DIR}/install-root/lib/$(basename ${OLD}) Subsurface.app/Contents/Frameworks SONAME=$(basename $OLD) install_name_tool -change ${OLD} @executable_path/../Frameworks/${SONAME} ${EXECUTABLE} - if [[ "$i" = "libssh" ]] ; then - LIBSSH=$(basename ${OLD}) - fi - if [[ "$i" = "libgit2" && ! -z ${LIBSSH} ]] ; then - CURLIBSSH=$(otool -L Subsurface.app/Contents/Frameworks/${SONAME} | grep libssh | cut -d\ -f1 | tr -d "\t") - install_name_tool -change ${CURLIBSSH} @executable_path/../Frameworks/${LIBSSH} Subsurface.app/Contents/Frameworks/${SONAME} + install_name_tool -id @executable_path/../Frameworks/${SONAME} Subsurface.app/Contents/Frameworks/${SONAME} + # also fix one incorrect reference inside of libgit2 + 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} fi fi done |