summaryrefslogtreecommitdiffstats
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-10 08:19:07 -0800
commitcfc22d07027ec9b7edbd411598ae4c36734defae (patch)
tree4b358f3d115481d26c08312a954cfba486809416 /scripts
parent7bf055bb420497e970a15002cfc657ad046caf25 (diff)
downloadsubsurface-cfc22d07027ec9b7edbd411598ae4c36734defae.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 f63c0d2c1..5e6e94eea 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -197,7 +197,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
@@ -237,7 +237,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