From e714263e8ad50b810f49ff8a381898459a433c8b Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 9 Dec 2015 12:22:39 -0800 Subject: build.sh: don't build libssh2 anymore on Mac I don't recall why this was needed, but things seem to work fine with the one avaialable via Homebrew Signed-off-by: Dirk Hohndel --- scripts/build.sh | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'scripts') diff --git a/scripts/build.sh b/scripts/build.sh index 639978c1f..d18993d61 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -36,34 +36,6 @@ export PKG_CONFIG_PATH=$INSTALL_ROOT/lib/pkgconfig:$PKG_CONFIG_PATH echo Building in $SRC, installing in $INSTALL_ROOT -# if on a mac, let's build our own libssh2 - -if [ $PLATFORM = Darwin ] ; then - echo Building libssh2 - if [ ! -d libssh2 ] ; then - if [[ $1 = local ]] ; then - git clone $SRC/../libssh2 libssh2 - else - git clone git://github.com/libssh2/libssh2 - fi - fi - cd libssh2 - mkdir -p build - cd build - cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON \ - .. - cmake --build . --target install - - # in order for macdeployqt to do its job correctly, we need the full path in the dylib ID - cd $INSTALL_ROOT/lib - NAME=$(otool -L libssh2.dylib | grep -v : | head -1 | cut -f1 -d\ | tr -d '\t') - echo $NAME | grep / > /dev/null 2>&1 - if [ $? -eq 1 ] ; then - install_name_tool -id "$INSTALL_ROOT/lib/$NAME" "$INSTALL_ROOT/lib/$NAME" - fi -fi - # build libgit2 cd $SRC -- cgit v1.2.3-70-g09d2