Skip to content

Commit 151d2aa

Browse files
committed
http: optionally load libcurl lazily
This compile-time option allows to ask Git to load libcurl dynamically at runtime. Together with a follow-up patch that optionally overrides the file name depending on the `http.sslBackend` setting, this kicks open the door for installing multiple libcurl flavors side by side, and load the one corresponding to the (runtime-)configured SSL/TLS backend. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 334cf72 commit 151d2aa

File tree

2 files changed

+365
-7
lines changed

2 files changed

+365
-7
lines changed

Makefile

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,11 @@ include shared.mak
464464
#
465465
# CURL_LDFLAGS=-lcurl
466466
#
467+
# Define LAZYLOAD_LIBCURL to dynamically load the libcurl; This can be useful
468+
# if Multiple libcurl versions exist (with different file names) that link to
469+
# various SSL/TLS backends, to support the `http.sslBackend` runtime switch in
470+
# such a scenario.
471+
#
467472
# === Optional library: libpcre2 ===
468473
#
469474
# Define USE_LIBPCRE if you have and want to use libpcre. Various
@@ -1601,10 +1606,19 @@ else
16011606
CURL_LIBCURL =
16021607
endif
16031608

1604-
ifndef CURL_LDFLAGS
1605-
CURL_LDFLAGS = $(eval CURL_LDFLAGS := $$(shell $$(CURL_CONFIG) --libs))$(CURL_LDFLAGS)
1609+
ifdef LAZYLOAD_LIBCURL
1610+
LAZYLOAD_LIBCURL_OBJ = compat/lazyload-curl.o
1611+
OBJECTS += $(LAZYLOAD_LIBCURL_OBJ)
1612+
# The `CURL_STATICLIB` constant must be defined to avoid seeing the functions
1613+
# declared as DLL imports
1614+
CURL_CFLAGS = -DCURL_STATICLIB
1615+
CURL_LIBCURL = -ldl
1616+
else
1617+
ifndef CURL_LDFLAGS
1618+
CURL_LDFLAGS = $(eval CURL_LDFLAGS := $$(shell $$(CURL_CONFIG) --libs))$(CURL_LDFLAGS)
1619+
endif
1620+
CURL_LIBCURL += $(CURL_LDFLAGS)
16061621
endif
1607-
CURL_LIBCURL += $(CURL_LDFLAGS)
16081622

16091623
ifndef CURL_CFLAGS
16101624
CURL_CFLAGS = $(eval CURL_CFLAGS := $$(shell $$(CURL_CONFIG) --cflags))$(CURL_CFLAGS)
@@ -1625,7 +1639,7 @@ else
16251639
endif
16261640
ifdef USE_CURL_FOR_IMAP_SEND
16271641
BASIC_CFLAGS += -DUSE_CURL_FOR_IMAP_SEND
1628-
IMAP_SEND_BUILDDEPS = http.o
1642+
IMAP_SEND_BUILDDEPS = http.o $(LAZYLOAD_LIBCURL_OBJ)
16291643
IMAP_SEND_LDFLAGS += $(CURL_LIBCURL)
16301644
endif
16311645
ifndef NO_EXPAT
@@ -2796,10 +2810,10 @@ git-imap-send$X: imap-send.o $(IMAP_SEND_BUILDDEPS) GIT-LDFLAGS $(GITLIBS)
27962810
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
27972811
$(IMAP_SEND_LDFLAGS) $(LIBS)
27982812

2799-
git-http-fetch$X: http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS)
2813+
git-http-fetch$X: http.o http-walker.o http-fetch.o $(LAZYLOAD_LIBCURL_OBJ) GIT-LDFLAGS $(GITLIBS)
28002814
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
28012815
$(CURL_LIBCURL) $(LIBS)
2802-
git-http-push$X: http.o http-push.o GIT-LDFLAGS $(GITLIBS)
2816+
git-http-push$X: http.o http-push.o $(LAZYLOAD_LIBCURL_OBJ) GIT-LDFLAGS $(GITLIBS)
28032817
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
28042818
$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
28052819

@@ -2809,7 +2823,7 @@ $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
28092823
ln -s $< $@ 2>/dev/null || \
28102824
cp $< $@
28112825

2812-
$(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS)
2826+
$(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o $(LAZYLOAD_LIBCURL_OBJ) GIT-LDFLAGS $(GITLIBS)
28132827
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
28142828
$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
28152829

0 commit comments

Comments
 (0)