From 81ea4d52b0e558704ee49dde9e8516bc18c09619 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Wed, 12 Oct 2022 08:34:38 +0200 Subject: Makefile: Fix use of renamed CMake options for libgit2 The recent upgrade to libgit2 v1.5.0 brought in renames of two CMake variables: - `-DTHREADSAFE` is now called `-DUSE_THREADS`. - `-DBUILD_CLAR` is now walled `-DBUILD_TESTS`. We failed to adapt accordingly and thus we're currently using the respective default values. As threads are enabled by default anyway this doesn't matter, but we now fail to disable tests and thus accidentally require Python to compile libgit2. Fix this by adjusting the variables. --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 66e0aadfd..b7efa3b34 100644 --- a/Makefile +++ b/Makefile @@ -191,8 +191,7 @@ LIBGIT2_INSTALL_DIR ?= ${DEPENDENCY_DIR}/libgit2/install ifeq ($(origin LIBGIT2_BUILD_OPTIONS),undefined) ## Build options for libgit2. LIBGIT2_BUILD_OPTIONS ?= - LIBGIT2_BUILD_OPTIONS += -DTHREADSAFE=ON - LIBGIT2_BUILD_OPTIONS += -DBUILD_CLAR=OFF + LIBGIT2_BUILD_OPTIONS += -DBUILD_TESTS=OFF LIBGIT2_BUILD_OPTIONS += -DBUILD_SHARED_LIBS=OFF LIBGIT2_BUILD_OPTIONS += -DCMAKE_C_FLAGS=-fPIC LIBGIT2_BUILD_OPTIONS += -DCMAKE_BUILD_TYPE=Release @@ -205,8 +204,8 @@ ifeq ($(origin LIBGIT2_BUILD_OPTIONS),undefined) LIBGIT2_BUILD_OPTIONS += -DUSE_NTLMCLIENT=OFF LIBGIT2_BUILD_OPTIONS += -DUSE_BUNDLED_ZLIB=ON LIBGIT2_BUILD_OPTIONS += -DUSE_HTTP_PARSER=builtin + LIBGIT2_BUILD_OPTIONS += -DUSE_THREADS=ON LIBGIT2_BUILD_OPTIONS += -DREGEX_BACKEND=builtin - LIBGIT2_BUILD_OPTIONS += -DBUILD_TESTS=OFF endif ifdef LIBGIT2_APPEND_BUILD_OPTIONS -- cgit v1.2.3