Skip to content

Commit 70515e9

Browse files
committed
Fix libgit2 patching for upgrade to 0.24.5
openssl-hang.patch was applied upstream in either 0.24.2 or 0.24.3
1 parent 1cf504d commit 70515e9

File tree

2 files changed

+1
-37
lines changed

2 files changed

+1
-37
lines changed

deps/libgit2.mk

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,8 @@ $(SRCDIR)/srccache/$(LIBGIT2_SRC_DIR)/libgit2-agent-nonfatal.patch-applied: $(SR
3939
cd $(SRCDIR)/srccache/$(LIBGIT2_SRC_DIR) && patch -p1 -f < $(SRCDIR)/patches/libgit2-agent-nonfatal.patch
4040
echo 1 > $@
4141

42-
$(SRCDIR)/srccache/$(LIBGIT2_SRC_DIR)/libgit2-openssl-hang.patch-applied: | $(SRCDIR)/srccache/$(LIBGIT2_SRC_DIR)/CMakeLists.txt
43-
cd $(SRCDIR)/srccache/$(LIBGIT2_SRC_DIR) && patch -p1 -f < $(SRCDIR)/patches/libgit2-openssl-hang.patch
44-
echo 1 > $@
45-
4642
ifeq ($(OS),Linux)
47-
$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/Makefile: $(SRCDIR)/srccache/$(LIBGIT2_SRC_DIR)/libgit2-require-openssl.patch-applied $(SRCDIR)/srccache/$(LIBGIT2_SRC_DIR)/libgit2-openssl-hang.patch-applied
43+
$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/Makefile: $(SRCDIR)/srccache/$(LIBGIT2_SRC_DIR)/libgit2-require-openssl.patch-applied
4844
endif
4945
ifneq ($(OS),WINNT)
5046
ifeq ($(USE_SYSTEM_CURL), 0)

deps/patches/libgit2-openssl-hang.patch

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)