diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-07-31 17:03:32 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-07-31 17:03:32 +0300 |
| commit | bf70b7bdcef2da641c946bd79be37a49d8ccded9 (patch) | |
| tree | a894ac58065d240e8c9e5fc249d17297ab9dcbc4 | |
| parent | 27ef86959e802d78ff51ec8b73e3d15220ff77c5 (diff) | |
| parent | 889fe0eafe9343744cb34e62d066a1c1f29cc5be (diff) | |
Merge branch 'pks-libgit2-iconv' into 'master'
Makefile: disable iconv support for libgit2
See merge request gitlab-org/gitaly!2434
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/pks-libgit2-iconv.yml | 5 |
2 files changed, 6 insertions, 0 deletions
@@ -107,6 +107,7 @@ ifeq (${LIBGIT2_BUILD_OPTIONS},) 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 diff --git a/changelogs/unreleased/pks-libgit2-iconv.yml b/changelogs/unreleased/pks-libgit2-iconv.yml new file mode 100644 index 000000000..25c30787f --- /dev/null +++ b/changelogs/unreleased/pks-libgit2-iconv.yml @@ -0,0 +1,5 @@ +--- +title: Disable iconv support for libgit2 +merge_request: 2434 +author: +type: fixed |