aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorGravatar Jan Mulder <jlmulder@xs4all.nl>2019-01-08 10:15:44 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-01-22 13:06:01 +1300
commit78ad59b22fa11630887fae84d28175fca3a82fed (patch)
tree08712ce07f30b5920e7339caf698912bfcf8c8ee /scripts
parent0bd75c8e9e4ff0f7fbce5da3e8929e7deaf5a723 (diff)
downloadsubsurface-78ad59b22fa11630887fae84d28175fca3a82fed.tar.gz
Build: build libgit2 from source when less than 0.26.0
We currently require a minimal version of libgit2 of 0.24.0. From issue #1926 it seems that this version is too old. So, a simple test on Linux to see the behaviour with such an old libgit2, I tried that. Interestingly, with the current version of openssl that old libgit2 version does not even compile from source (known error in libgit2). So, bump our minimal version of libgit2 to 0.26.0. That is also the version we currently use on the Travis and official builds, so well tested. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/build.sh b/scripts/build.sh
index f8cb30c8f..f46b2c85f 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -201,7 +201,7 @@ else
LIBGIT=$(pkg-config --modversion libgit2 | cut -d. -f2)
LIBGIT2_FROM_PKGCONFIG="-DLIBGIT2_FROM_PKGCONFIG=ON"
fi
- if [[ "$LIBGIT" < "24" ]] ; then
+ if [[ "$LIBGIT" < "26" ]] ; then
# maybe there's a system version that's new enough?
LIBGIT=$(ldconfig -p | grep libgit2\\.so\\. | awk -F. '{ print $NF }')
fi
@@ -241,7 +241,7 @@ if [[ $PLATFORM = Darwin && "$BUILD_DEPS" == "1" ]] ; then
fi
fi
-if [[ "$LIBGIT" < "24" ]] ; then
+if [[ "$LIBGIT" < "26" ]] ; then
LIBGIT_ARGS=" -DLIBGIT2_INCLUDE_DIR=$INSTALL_ROOT/include -DLIBGIT2_LIBRARIES=$INSTALL_ROOT/lib/libgit2.$SH_LIB_EXT "
cd $SRC