Changeset 6bba524 in subsurface


Ignore:
Timestamp:
Jul 3, 2017, 9:45:55 AM (3 weeks ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
36d462e
Parents:
9c0cc531
git-author:
Dirk Hohndel <dirk@…> (07/03/17 09:36:25)
git-committer:
Dirk Hohndel <dirk@…> (07/03/17 09:45:55)
Message:

Mac package build: adjust handling of libgit2

Apparently it now is a different dependency that causes problems.

Signed-off-by: Dirk Hohndel <dirk@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packaging/macosx/make-package.sh

    r9c0cc531 r6bba524  
    2626        OLD=$(otool -L ${EXECUTABLE} | grep $i | cut -d\  -f1 | tr -d "\t")
    2727        if [ ! -z ${OLD} ] ; then
     28                # copy the library into the bundle and make sure its id and the reference to it are correct
    2829                cp ${DIR}/install-root/lib/$(basename ${OLD}) Subsurface.app/Contents/Frameworks
    2930                SONAME=$(basename $OLD)
    3031                install_name_tool -change ${OLD} @executable_path/../Frameworks/${SONAME} ${EXECUTABLE}
    31                 if [[ "$i" = "libssh" ]] ; then
    32                         LIBSSH=$(basename ${OLD})
    33                 fi
    34                 if [[ "$i" = "libgit2" && ! -z ${LIBSSH} ]] ; then
    35                         CURLIBSSH=$(otool -L Subsurface.app/Contents/Frameworks/${SONAME} | grep libssh | cut -d\  -f1 | tr -d "\t")
    36                         install_name_tool -change ${CURLIBSSH} @executable_path/../Frameworks/${LIBSSH} Subsurface.app/Contents/Frameworks/${SONAME}
     32                install_name_tool -id @executable_path/../Frameworks/${SONAME} Subsurface.app/Contents/Frameworks/${SONAME}
     33                # also fix one incorrect reference inside of libgit2
     34                if [[ "$i" = "libgit2" ]] ; then
     35                        CURLLIB=$(otool -L Subsurface.app/Contents/Frameworks/${SONAME} | grep libcurl | cut -d\  -f1 | tr -d "\t")
     36                        install_name_tool -change ${CURLLIB} @executable_path/../Frameworks/$(basename ${CURLLIB}) Subsurface.app/Contents/Frameworks/${SONAME}
    3737                fi
    3838        fi
Note: See TracChangeset for help on using the changeset viewer.