Skip to content

Patch curl so that it builds without BinaryBuilder #55290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 29, 2024
Merged

Patch curl so that it builds without BinaryBuilder #55290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions deps/curl.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ checksum-curl: $(SRCCACHE)/curl-$(CURL_VER).tar.bz2
# Disable....almost everything
CURL_CONFIGURE_FLAGS := $(CONFIGURE_COMMON) \
--without-gnutls --without-libidn2 --without-librtmp \
--without-nss --without-libpsl --without-libgsasl --without-fish-functions-dir \
--without-libpsl --without-libgsasl --without-fish-functions-dir \
--disable-ares --disable-manual --disable-ldap --disable-ldaps --disable-static \
--without-gssapi --without-brotli
# A few things we actually enable
Expand All @@ -57,7 +57,15 @@ CURL_TLS_CONFIGURE_FLAGS := --with-mbedtls=$(build_prefix)
endif
CURL_CONFIGURE_FLAGS += $(CURL_TLS_CONFIGURE_FLAGS)

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

$(SRCCACHE)/curl-$(CURL_VER)/source-patched: $(SRCCACHE)/curl-$(CURL_VER)/curl-8.6.0-build.patch-applied
echo 1 > $@

$(BUILDDIR)/curl-$(CURL_VER)/build-configured: $(SRCCACHE)/curl-$(CURL_VER)/source-patched
mkdir -p $(dir $@)
cd $(dir $@) && \
$(dir $<)/configure $(CURL_CONFIGURE_FLAGS) \
Expand Down
23 changes: 23 additions & 0 deletions deps/patches/curl-8.6.0-build.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From 5cc2b016c36aaf5a08e2feb7c068fca5bb0a8052 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 5 Feb 2024 15:22:08 +0100
Subject: [PATCH] md4: include strdup.h for the memdup proto

Reported-by: Erik Schnetter
Fixes #12849
Closes #12863
---
lib/md4.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/lib/md4.c b/lib/md4.c
index 067c211e420afd..58dd1166cf924f 100644
--- a/lib/md4.c
+++ b/lib/md4.c
@@ -28,6 +28,7 @@

#include <string.h>

+#include "strdup.h"
#include "curl_md4.h"
#include "warnless.h"