diff options
| author | Toon Claes <toon@gitlab.com> | 2022-10-14 14:54:42 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2022-10-14 14:54:42 +0300 |
| commit | a448e91833677fe766292de42f3061daa5ed6e5a (patch) | |
| tree | 6147e4d9eeeaa0dbe8c013c10a3276a3d754dca3 | |
| parent | f3d88b60eaf1566da4784e696a00e5969bd3f98d (diff) | |
| parent | 4ea8df1174e84758bcc0322491d0457d3aecce2a (diff) | |
Merge branch 'pks-libgit2-build-options-fixup' into 'master'
Makefile: Adapt to changed build options in libgit2 v1.5.0
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/4933
Merged-by: Toon Claes <toon@gitlab.com>
Approved-by: Toon Claes <toon@gitlab.com>
Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com>
| -rw-r--r-- | Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -191,22 +191,21 @@ 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_CLI=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 LIBGIT2_BUILD_OPTIONS += -DCMAKE_INSTALL_PREFIX=${LIBGIT2_INSTALL_DIR} LIBGIT2_BUILD_OPTIONS += -DCMAKE_INSTALL_LIBDIR=lib - LIBGIT2_BUILD_OPTIONS += -DENABLE_TRACE=OFF LIBGIT2_BUILD_OPTIONS += -DUSE_SSH=OFF LIBGIT2_BUILD_OPTIONS += -DUSE_HTTPS=OFF LIBGIT2_BUILD_OPTIONS += -DUSE_ICONV=OFF 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 |