@@ -464,6 +464,11 @@ include shared.mak
464
464
#
465
465
# CURL_LDFLAGS=-lcurl
466
466
#
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
+ #
467
472
# === Optional library: libpcre2 ===
468
473
#
469
474
# Define USE_LIBPCRE if you have and want to use libpcre. Various
@@ -1599,10 +1604,19 @@ else
1599
1604
CURL_LIBCURL =
1600
1605
endif
1601
1606
1602
- ifndef CURL_LDFLAGS
1603
- CURL_LDFLAGS = $(eval CURL_LDFLAGS := $$(shell $$(CURL_CONFIG) --libs))$(CURL_LDFLAGS)
1607
+ ifdef LAZYLOAD_LIBCURL
1608
+ LAZYLOAD_LIBCURL_OBJ = compat/lazyload-curl.o
1609
+ OBJECTS += $(LAZYLOAD_LIBCURL_OBJ)
1610
+ # The `CURL_STATICLIB` constant must be defined to avoid seeing the functions
1611
+ # declared as DLL imports
1612
+ CURL_CFLAGS = -DCURL_STATICLIB
1613
+ CURL_LIBCURL = -ldl
1614
+ else
1615
+ ifndef CURL_LDFLAGS
1616
+ CURL_LDFLAGS = $(eval CURL_LDFLAGS := $$(shell $$(CURL_CONFIG) --libs))$(CURL_LDFLAGS)
1617
+ endif
1618
+ CURL_LIBCURL += $(CURL_LDFLAGS)
1604
1619
endif
1605
- CURL_LIBCURL += $(CURL_LDFLAGS)
1606
1620
1607
1621
ifndef CURL_CFLAGS
1608
1622
CURL_CFLAGS = $(eval CURL_CFLAGS := $$(shell $$(CURL_CONFIG) --cflags))$(CURL_CFLAGS)
@@ -1623,7 +1637,7 @@ else
1623
1637
endif
1624
1638
ifdef USE_CURL_FOR_IMAP_SEND
1625
1639
BASIC_CFLAGS += -DUSE_CURL_FOR_IMAP_SEND
1626
- IMAP_SEND_BUILDDEPS = http.o
1640
+ IMAP_SEND_BUILDDEPS = http.o $(LAZYLOAD_LIBCURL_OBJ)
1627
1641
IMAP_SEND_LDFLAGS += $(CURL_LIBCURL)
1628
1642
endif
1629
1643
ifndef NO_EXPAT
@@ -2829,10 +2843,10 @@ git-imap-send$X: imap-send.o $(IMAP_SEND_BUILDDEPS) GIT-LDFLAGS $(GITLIBS)
2829
2843
$(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
2830
2844
$(IMAP_SEND_LDFLAGS ) $(LIBS )
2831
2845
2832
- git-http-fetch$X : http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS )
2846
+ git-http-fetch$X : http.o http-walker.o http-fetch.o $( LAZYLOAD_LIBCURL_OBJ ) GIT-LDFLAGS $(GITLIBS )
2833
2847
$(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
2834
2848
$(CURL_LIBCURL ) $(LIBS )
2835
- git-http-push$X : http.o http-push.o GIT-LDFLAGS $(GITLIBS )
2849
+ git-http-push$X : http.o http-push.o $( LAZYLOAD_LIBCURL_OBJ ) GIT-LDFLAGS $(GITLIBS )
2836
2850
$(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
2837
2851
$(CURL_LIBCURL ) $(EXPAT_LIBEXPAT ) $(LIBS )
2838
2852
@@ -2842,7 +2856,7 @@ $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
2842
2856
ln -s $< $@ 2> /dev/null || \
2843
2857
cp $< $@
2844
2858
2845
- $(REMOTE_CURL_PRIMARY ) : remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS )
2859
+ $(REMOTE_CURL_PRIMARY ) : remote-curl.o http.o http-walker.o $( LAZYLOAD_LIBCURL_OBJ ) GIT-LDFLAGS $(GITLIBS )
2846
2860
$(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
2847
2861
$(CURL_LIBCURL ) $(EXPAT_LIBEXPAT ) $(LIBS )
2848
2862
0 commit comments