From a0b455582df00f9a1faebf328d398384d003f180 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 1 Jun 2015 12:52:42 -0700 Subject: Build script: use sufficiently new libgit2 and enable cloud storage Turns out that as of a day ago or so tip of libgit2 master appears broken (the in memory ssh key test in the cmake file fails). But the specific commit that I'm picking here appears to work and is also new enough that https and ssh based cloud storage works. Signed-off-by: Dirk Hohndel --- scripts/build.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index f4db5518d..8ebdea972 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -40,7 +40,8 @@ if [ ! -d libgit2 ] ; then fi fi cd libgit2 -git checkout v0.22.0 +# let's build with a recent enough version of master for the latest features +git checkout c11daac9de2 mkdir -p build cd build cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT -DCMAKE_BUILD_TYPE=Release -DBUILD_CLAR=OFF .. @@ -116,7 +117,8 @@ cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT .. \ -DLIBDIVECOMPUTER_INCLUDE_DIR=$INSTALL_ROOT/include \ -DLIBDIVECOMPUTER_LIBRARIES=$INSTALL_ROOT/lib/libdivecomputer.a \ -DMARBLE_INCLUDE_DIR=$INSTALL_ROOT/include \ - -DMARBLE_LIBRARIES=$INSTALL_ROOT/lib/libssrfmarblewidget.$SH_LIB_EXT + -DMARBLE_LIBRARIES=$INSTALL_ROOT/lib/libssrfmarblewidget.$SH_LIB_EXT \ + -DUSE_LIBGIT23_API=1 make -j4 make install -- cgit v1.2.3-70-g09d2