diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-11-24 13:02:39 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-11-24 16:58:55 -0800 |
| commit | 775d27e5ffa23d477d7d81995e9dc45970495c6a (patch) | |
| tree | 9ddf5b451207df52ad954a60c6abb853337b1d39 /scripts/mac | |
| parent | a240787c426ee74013dad983616de2ab4a0a01a9 (diff) | |
| download | subsurface-775d27e5ffa23d477d7d81995e9dc45970495c6a.tar.gz | |
Travis: Mac build prevent error out when not using libcurl/libssh2
This shouldn't be needed anymore since the Homebrew libgit2 is not linked
against libcurl and libssh2.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts/mac')
| -rw-r--r-- | scripts/mac/travisbuild.sh | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/scripts/mac/travisbuild.sh b/scripts/mac/travisbuild.sh index 7675db462..7b70d0e30 100644 --- a/scripts/mac/travisbuild.sh +++ b/scripts/mac/travisbuild.sh @@ -34,17 +34,21 @@ for i in libgit2 libGrantlee_TextDocument.dylib libGrantlee_Templates.dylib; do install_name_tool -change ${OLD} @executable_path/../Frameworks/${SONAME} ${EXECUTABLE} install_name_tool -id @executable_path/../Frameworks/${SONAME} Subsurface.app/Contents/Frameworks/${SONAME} # also fix incorrect references 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} - 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 + # if [[ "$i" = "libgit2" ]] ; then + # CURLLIB=$(otool -L Subsurface.app/Contents/Frameworks/${SONAME} | grep libcurl | cut -d\ -f1 | tr -d "\t") + # if [ ! -z $CURLLIB ] ; then + # install_name_tool -change ${CURLLIB} @executable_path/../Frameworks/$(basename ${CURLLIB}) Subsurface.app/Contents/Frameworks/${SONAME} + # fi + # SSHLIB=$(otool -L Subsurface.app/Contents/Frameworks/${SONAME} | grep libssh2 | cut -d\ -f1 | tr -d "\t") + # if [ ! -z $SSHLIB ] ; then + # install_name_tool -change ${SSHLIB} @executable_path/../Frameworks/$(basename ${SSHLIB}) Subsurface.app/Contents/Frameworks/${SONAME} + # fi + # 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- ) |