diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-05-19 19:52:46 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2018-05-19 21:22:31 -0700 |
| commit | dce7e46766f5acb8d4723f0b126df120e17051dd (patch) | |
| tree | b6eb5fcdfe18d062b11f1f501dcc4864ca547d70 | |
| parent | d417d717b99f322ba297199c311495cc93a3e1ef (diff) | |
| download | subsurface-dce7e46766f5acb8d4723f0b126df120e17051dd.tar.gz | |
Mac: don't try to copy libraries we got from Homebrew
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rwxr-xr-x | packaging/macosx/make-package.sh | 2 | ||||
| -rw-r--r-- | scripts/mac/travisbuild.sh | 16 |
2 files changed, 2 insertions, 16 deletions
diff --git a/packaging/macosx/make-package.sh b/packaging/macosx/make-package.sh index ba717bdb2..e1da0fc75 100755 --- a/packaging/macosx/make-package.sh +++ b/packaging/macosx/make-package.sh @@ -26,7 +26,7 @@ LIBRARY_PATH=${DIR}/install-root/lib make install EXECUTABLE=Subsurface.app/Contents/MacOS/Subsurface for i in libgit2 libGrantlee_TextDocument.dylib libGrantlee_Templates.dylib; do OLD=$(otool -L ${EXECUTABLE} | grep $i | cut -d\ -f1 | tr -d "\t") - if [ ! -z ${OLD} ] ; then + if [[ ! -z ${OLD} && ! -f Subsurface.app/Contents/Frameworks/$(basename ${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) diff --git a/scripts/mac/travisbuild.sh b/scripts/mac/travisbuild.sh index 40fad844f..029deebe0 100644 --- a/scripts/mac/travisbuild.sh +++ b/scripts/mac/travisbuild.sh @@ -26,29 +26,15 @@ LIBRARY_PATH=${DIR}/install-root/lib make -j2 install EXECUTABLE=Subsurface.app/Contents/MacOS/Subsurface for i in libgit2 libGrantlee_TextDocument.dylib libGrantlee_Templates.dylib; do OLD=$(otool -L ${EXECUTABLE} | grep $i | cut -d\ -f1 | tr -d "\t") - if [ ! -z ${OLD} ] ; then + if [[ ! -z ${OLD} && ! -f Subsurface.app/Contents/Frameworks/$(basename ${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} 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") - # 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 - # 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- ) for i in ${RPATH}; do |