Skip to content

Commit 1bbe8cf

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 5747657 commit 1bbe8cf

File tree

2 files changed

+375
-7
lines changed

2 files changed

+375
-7
lines changed

Makefile

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -471,6 +471,11 @@ include shared.mak
471471
#
472472
# CURL_LDFLAGS=-lcurl
473473
#
474+
# Define LAZYLOAD_LIBCURL to dynamically load the libcurl; This can be useful
475+
# if Multiple libcurl versions exist (with different file names) that link to
476+
# various SSL/TLS backends, to support the `http.sslBackend` runtime switch in
477+
# such a scenario.
478+
#
474479
# === Optional library: libpcre2 ===
475480
#
476481
# Define USE_LIBPCRE if you have and want to use libpcre. Various
@@ -1636,10 +1641,19 @@ else
16361641
CURL_LIBCURL =
16371642
endif
16381643

1639-
ifndef CURL_LDFLAGS
1640-
CURL_LDFLAGS = $(eval CURL_LDFLAGS := $$(shell $$(CURL_CONFIG) --libs))$(CURL_LDFLAGS)
1644+
ifdef LAZYLOAD_LIBCURL
1645+
LAZYLOAD_LIBCURL_OBJ = compat/lazyload-curl.o
1646+
OBJECTS += $(LAZYLOAD_LIBCURL_OBJ)
1647+
# The `CURL_STATICLIB` constant must be defined to avoid seeing the functions
1648+
# declared as DLL imports
1649+
CURL_CFLAGS = -DCURL_STATICLIB
1650+
CURL_LIBCURL = -ldl
1651+
else
1652+
ifndef CURL_LDFLAGS
1653+
CURL_LDFLAGS = $(eval CURL_LDFLAGS := $$(shell $$(CURL_CONFIG) --libs))$(CURL_LDFLAGS)
1654+
endif
1655+
CURL_LIBCURL += $(CURL_LDFLAGS)
16411656
endif
1642-
CURL_LIBCURL += $(CURL_LDFLAGS)
16431657

16441658
ifndef CURL_CFLAGS
16451659
CURL_CFLAGS = $(eval CURL_CFLAGS := $$(shell $$(CURL_CONFIG) --cflags))$(CURL_CFLAGS)
@@ -1660,7 +1674,7 @@ else
16601674
endif
16611675
ifdef USE_CURL_FOR_IMAP_SEND
16621676
BASIC_CFLAGS += -DUSE_CURL_FOR_IMAP_SEND
1663-
IMAP_SEND_BUILDDEPS = http.o
1677+
IMAP_SEND_BUILDDEPS = http.o $(LAZYLOAD_LIBCURL_OBJ)
16641678
IMAP_SEND_LDFLAGS += $(CURL_LIBCURL)
16651679
endif
16661680
ifndef NO_EXPAT
@@ -2847,10 +2861,10 @@ git-imap-send$X: imap-send.o $(IMAP_SEND_BUILDDEPS) GIT-LDFLAGS $(GITLIBS)
28472861
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
28482862
$(IMAP_SEND_LDFLAGS) $(LIBS)
28492863

2850-
git-http-fetch$X: http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS)
2864+
git-http-fetch$X: http.o http-walker.o http-fetch.o $(LAZYLOAD_LIBCURL_OBJ) GIT-LDFLAGS $(GITLIBS)
28512865
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
28522866
$(CURL_LIBCURL) $(LIBS)
2853-
git-http-push$X: http.o http-push.o GIT-LDFLAGS $(GITLIBS)
2867+
git-http-push$X: http.o http-push.o $(LAZYLOAD_LIBCURL_OBJ) GIT-LDFLAGS $(GITLIBS)
28542868
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
28552869
$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
28562870

@@ -2860,7 +2874,7 @@ $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
28602874
ln -s $< $@ 2>/dev/null || \
28612875
cp $< $@
28622876

2863-
$(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS)
2877+
$(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o $(LAZYLOAD_LIBCURL_OBJ) GIT-LDFLAGS $(GITLIBS)
28642878
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
28652879
$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
28662880

0 commit comments

Comments
 (0)