Skip to content

Commit 313f933

Browse files
authored
curl: remove patch (JuliaLang#53892)
This upstream patch needs to be removed because in latest curl, it's already applied. This currently prevents a build from source. (And I am wondering why that was not caught?)
1 parent 24ff6f4 commit 313f933

File tree

2 files changed

+1
-34
lines changed

2 files changed

+1
-34
lines changed

deps/curl.mk

+1-10
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,7 @@ CURL_TLS_CONFIGURE_FLAGS := --with-mbedtls=$(build_prefix)
5757
endif
5858
CURL_CONFIGURE_FLAGS += $(CURL_TLS_CONFIGURE_FLAGS)
5959

60-
$(BUILDDIR)/curl-$(CURL_VER)/source-extracted/curl-memdup.patch-applied: $(SRCCACHE)/curl-$(CURL_VER)/source-extracted
61-
mkdir -p $(dir $@)
62-
cd $(SRCCACHE)/curl-$(CURL_VER) && \
63-
patch -p1 -f < $(SRCDIR)/patches/curl-memdup.patch
64-
echo 1 > $@
65-
66-
$(SRCCACHE)/curl-$(CURL_VER)/source-patched: $(BUILDDIR)/curl-$(CURL_VER)/source-extracted/curl-memdup.patch-applied
67-
echo 1 > $@
68-
69-
$(BUILDDIR)/curl-$(CURL_VER)/build-configured: $(SRCCACHE)/curl-$(CURL_VER)/source-patched
60+
$(BUILDDIR)/curl-$(CURL_VER)/build-configured: $(SRCCACHE)/curl-$(CURL_VER)/source-extracted
7061
mkdir -p $(dir $@)
7162
cd $(dir $@) && \
7263
$(dir $<)/configure $(CURL_CONFIGURE_FLAGS) \

deps/patches/curl-memdup.patch

-24
This file was deleted.

0 commit comments

Comments
 (0)