Skip to content

Commit

Permalink
Bump libgit2 to 0.28.2 (#32806)
Browse files Browse the repository at this point in the history
This allows dropping MbedTLS patches which have been upstreamed.
The order in which configuration options are returned has changed, making a test fail:
make the code more robust by giving priority to more specific options over global ones.
  • Loading branch information
nalimilan authored Aug 22, 2019
1 parent 9156082 commit d0b5d98
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 1,000 deletions.
4 changes: 2 additions & 2 deletions deps/Versions.make
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ LIBSSH2_VER = 1.8.2
LIBSSH2_BB_REL = 0
CURL_VER = 7.61.0
CURL_BB_REL = 1
LIBGIT2_VER = 0.27.7
LIBGIT2_BB_REL = 1
LIBGIT2_VER = 0.28.2
LIBGIT2_BB_REL = 0
LIBUV_VER = 1.29.1
LIBUV_BB_REL = 0
OBJCONV_VER = 2.49.0
Expand Down
16 changes: 2 additions & 14 deletions deps/libgit2.mk
Original file line number Diff line number Diff line change
Expand Up @@ -44,24 +44,12 @@ endif

LIBGIT2_SRC_PATH := $(SRCCACHE)/$(LIBGIT2_SRC_DIR)

$(LIBGIT2_SRC_PATH)/libgit2-mbedtls.patch-applied: $(SRCCACHE)/$(LIBGIT2_SRC_DIR)/source-extracted
cd $(LIBGIT2_SRC_PATH) && \
patch -p1 -f < $(SRCDIR)/patches/libgit2-mbedtls.patch
echo 1 > $@

$(LIBGIT2_SRC_PATH)/libgit2-mbedtls2.patch-applied: $(SRCCACHE)/$(LIBGIT2_SRC_DIR)/source-extracted | $(LIBGIT2_SRC_PATH)/libgit2-mbedtls.patch-applied
cd $(LIBGIT2_SRC_PATH) && \
patch -p1 -f < $(SRCDIR)/patches/libgit2-mbedtls2.patch
echo 1 > $@

$(LIBGIT2_SRC_PATH)/libgit2-agent-nonfatal.patch-applied: $(LIBGIT2_SRC_PATH)/source-extracted | $(LIBGIT2_SRC_PATH)/libgit2-mbedtls.patch-applied
$(LIBGIT2_SRC_PATH)/libgit2-agent-nonfatal.patch-applied: $(LIBGIT2_SRC_PATH)/source-extracted
cd $(LIBGIT2_SRC_PATH) && \
patch -p1 -f < $(SRCDIR)/patches/libgit2-agent-nonfatal.patch
echo 1 > $@

$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: \
$(LIBGIT2_SRC_PATH)/libgit2-mbedtls.patch-applied \
$(LIBGIT2_SRC_PATH)/libgit2-mbedtls2.patch-applied \
$(LIBGIT2_SRC_PATH)/libgit2-agent-nonfatal.patch-applied \

$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: $(LIBGIT2_SRC_PATH)/source-extracted
Expand Down Expand Up @@ -109,7 +97,7 @@ $(build_prefix)/manifest/libgit2: $(build_datarootdir)/julia/cert.pem # use libg

else # USE_BINARYBUILDER_LIBGIT2

LIBGIT2_BB_URL_BASE := https://github.com/JuliaPackaging/Yggdrasil/releases/download/LibGit2-v$(LIBGIT2_VER)-$(LIBGIT2_BB_REL)
LIBGIT2_BB_URL_BASE := https://github.com/JuliaPackaging/Yggdrasil/releases/download/LibGit2-v$(LIBGIT2_VER)+$(LIBGIT2_BB_REL)
LIBGIT2_BB_NAME := LibGit2.v$(LIBGIT2_VER)
$(eval $(call bb-install,libgit2,LIBGIT2,false))

Expand Down
4 changes: 2 additions & 2 deletions deps/libgit2.version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LIBGIT2_BRANCH=v0.27.7
LIBGIT2_SHA1=f23dc5b29f1394928a940d7ec447f4bfd53dad1f
LIBGIT2_BRANCH=v0.28.2
LIBGIT2_SHA1=b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3
Loading

0 comments on commit d0b5d98

Please sign in to comment.