Skip to content

Commit

Permalink
curl: remove patch (#53892)
Browse files Browse the repository at this point in the history
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?)
  • Loading branch information
fxcoudert authored Mar 30, 2024
1 parent 24ff6f4 commit 313f933
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 34 deletions.
11 changes: 1 addition & 10 deletions deps/curl.mk
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,7 @@ CURL_TLS_CONFIGURE_FLAGS := --with-mbedtls=$(build_prefix)
endif
CURL_CONFIGURE_FLAGS += $(CURL_TLS_CONFIGURE_FLAGS)

$(BUILDDIR)/curl-$(CURL_VER)/source-extracted/curl-memdup.patch-applied: $(SRCCACHE)/curl-$(CURL_VER)/source-extracted
mkdir -p $(dir $@)
cd $(SRCCACHE)/curl-$(CURL_VER) && \
patch -p1 -f < $(SRCDIR)/patches/curl-memdup.patch
echo 1 > $@

$(SRCCACHE)/curl-$(CURL_VER)/source-patched: $(BUILDDIR)/curl-$(CURL_VER)/source-extracted/curl-memdup.patch-applied
echo 1 > $@

$(BUILDDIR)/curl-$(CURL_VER)/build-configured: $(SRCCACHE)/curl-$(CURL_VER)/source-patched
$(BUILDDIR)/curl-$(CURL_VER)/build-configured: $(SRCCACHE)/curl-$(CURL_VER)/source-extracted
mkdir -p $(dir $@)
cd $(dir $@) && \
$(dir $<)/configure $(CURL_CONFIGURE_FLAGS) \
Expand Down
24 changes: 0 additions & 24 deletions deps/patches/curl-memdup.patch

This file was deleted.

0 comments on commit 313f933

Please sign in to comment.