From 86396e9904f18e2379689ce4d7f83a88dc3016d1 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 16 Oct 2020 19:06:32 -0700 Subject: build-system: fix libgit2 detection Usually ldconfig isn't in the user's path. Suggested-by: Cristian Ionescu-Idbohrn Signed-off-by: Dirk Hohndel --- scripts/build.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/build.sh b/scripts/build.sh index 9d115310e..cc83eeccb 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -265,9 +265,12 @@ else # maybe there's a system version that's new enough? # Ugh that's uggly - read the ultimate filename, split at the last 'o' which gets us ".0.26.3" or ".1.0.0" # since that starts with a dot, the field numbers in the cut need to be one higher - LIBGIT=$(realpath $(ldconfig -p | grep libgit2\\.so\\. | cut -d\ -f4) | awk -Fo '{ print $NF }') - LIBGITMAJ=$(echo $LIBGIT | cut -d. -f2) - LIBGIT=$(echo $LIBGIT | cut -d. -f3) + LDCONFIG=$(PATH=/sbin:/usr/sbin:$PATH which ldconfig) + if [ ! -z "$LDCONFIG" ] ; then + LIBGIT=$(realpath $("$LDCONFIG" -p | grep libgit2\\.so\\. | cut -d\ -f4) | awk -Fo '{ print $NF }') + LIBGITMAJ=$(echo $LIBGIT | cut -d. -f2) + LIBGIT=$(echo $LIBGIT | cut -d. -f3) + fi fi fi -- cgit v1.2.3-70-g09d2