Skip to content

Commit 2f6d027

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 01e8056 commit 2f6d027

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
@@ -1647,10 +1652,19 @@ else
16471652
CURL_LIBCURL =
16481653
endif
16491654

1650-
ifndef CURL_LDFLAGS
1651-
CURL_LDFLAGS = $(eval CURL_LDFLAGS := $$(shell $$(CURL_CONFIG) --libs))$(CURL_LDFLAGS)
1655+
ifdef LAZYLOAD_LIBCURL
1656+
LAZYLOAD_LIBCURL_OBJ = compat/lazyload-curl.o
1657+
OBJECTS += $(LAZYLOAD_LIBCURL_OBJ)
1658+
# The `CURL_STATICLIB` constant must be defined to avoid seeing the functions
1659+
# declared as DLL imports
1660+
CURL_CFLAGS = -DCURL_STATICLIB
1661+
CURL_LIBCURL = -ldl
1662+
else
1663+
ifndef CURL_LDFLAGS
1664+
CURL_LDFLAGS = $(eval CURL_LDFLAGS := $$(shell $$(CURL_CONFIG) --libs))$(CURL_LDFLAGS)
1665+
endif
1666+
CURL_LIBCURL += $(CURL_LDFLAGS)
16521667
endif
1653-
CURL_LIBCURL += $(CURL_LDFLAGS)
16541668

16551669
ifndef CURL_CFLAGS
16561670
CURL_CFLAGS = $(eval CURL_CFLAGS := $$(shell $$(CURL_CONFIG) --cflags))$(CURL_CFLAGS)
@@ -1671,7 +1685,7 @@ else
16711685
endif
16721686
ifdef USE_CURL_FOR_IMAP_SEND
16731687
BASIC_CFLAGS += -DUSE_CURL_FOR_IMAP_SEND
1674-
IMAP_SEND_BUILDDEPS = http.o
1688+
IMAP_SEND_BUILDDEPS = http.o $(LAZYLOAD_LIBCURL_OBJ)
16751689
IMAP_SEND_LDFLAGS += $(CURL_LIBCURL)
16761690
endif
16771691
ifndef NO_EXPAT
@@ -2849,10 +2863,10 @@ git-imap-send$X: imap-send.o $(IMAP_SEND_BUILDDEPS) GIT-LDFLAGS $(GITLIBS)
28492863
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
28502864
$(IMAP_SEND_LDFLAGS) $(LIBS)
28512865

2852-
git-http-fetch$X: http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS)
2866+
git-http-fetch$X: http.o http-walker.o http-fetch.o $(LAZYLOAD_LIBCURL_OBJ) GIT-LDFLAGS $(GITLIBS)
28532867
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
28542868
$(CURL_LIBCURL) $(LIBS)
2855-
git-http-push$X: http.o http-push.o GIT-LDFLAGS $(GITLIBS)
2869+
git-http-push$X: http.o http-push.o $(LAZYLOAD_LIBCURL_OBJ) GIT-LDFLAGS $(GITLIBS)
28562870
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
28572871
$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
28582872

@@ -2862,7 +2876,7 @@ $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
28622876
ln -s $< $@ 2>/dev/null || \
28632877
cp $< $@
28642878

2865-
$(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS)
2879+
$(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o $(LAZYLOAD_LIBCURL_OBJ) GIT-LDFLAGS $(GITLIBS)
28662880
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
28672881
$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
28682882

0 commit comments

Comments
 (0)