From c71db2671819e5d2f4e1775759c65aa8236f670c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Tue, 11 May 2021 16:43:50 -0400
Subject: [PATCH] misc: remove unnecessary --build for libgit2 and check recent
openDHT version
Change-Id: Ic6f2cd3e0b0cf839dc602231ad4b0a4914968b2e
---
configure.ac | 2 +-
contrib/src/libgit2/rules.mak | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 565dde741b..6e5ede7b19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -565,7 +565,7 @@ fi
AM_CONDITIONAL([HAVE_WEBRTC_AP], test "x$with_webrtc_ap" = "xyes")
dnl check for openDHT
-PKG_CHECK_MODULES([OPENDHT], [opendht >= 0.6.1],,
+PKG_CHECK_MODULES([OPENDHT], [opendht >= 2.2.0],,
AC_MSG_FAILURE([Missing OpenDHT]))
PKG_CHECK_MODULES([SECP256K1], [libsecp256k1 >= 0.1],,
diff --git a/contrib/src/libgit2/rules.mak b/contrib/src/libgit2/rules.mak
index 1a0219a998..4f56da1465 100644
--- a/contrib/src/libgit2/rules.mak
+++ b/contrib/src/libgit2/rules.mak
@@ -24,6 +24,5 @@ libgit2: libgit2-v$(LIBGIT2_VERSION).tar.gz .sum-libgit2
.libgit2: libgit2
cd $< && mkdir -p build && cd build \
&& $(CMAKE) -DCMAKE_C_FLAGS=-fPIC -DCMAKE_INSTALL_PREFIX=$(PREFIX) -DUSE_HTTPS=OFF -DCURL=OFF -DUSE_HTTP_PARSER=system -DBUILD_CLAR=OFF -DBUILD_SHARED_LIBS=OFF -DUSE_SSH=OFF -DREGEX_BACKEND=regcomp .. \
- && $(CMAKE) --build . \
&& $(MAKE) install
touch $@
--
GitLab