@@ -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
@@ -1616,10 +1621,19 @@ else
1616
1621
CURL_LIBCURL =
1617
1622
endif
1618
1623
1619
- ifndef CURL_LDFLAGS
1620
- CURL_LDFLAGS = $(eval CURL_LDFLAGS := $$(shell $$(CURL_CONFIG) --libs))$(CURL_LDFLAGS)
1624
+ ifdef LAZYLOAD_LIBCURL
1625
+ LAZYLOAD_LIBCURL_OBJ = compat/lazyload-curl.o
1626
+ OBJECTS += $(LAZYLOAD_LIBCURL_OBJ)
1627
+ # The `CURL_STATICLIB` constant must be defined to avoid seeing the functions
1628
+ # declared as DLL imports
1629
+ CURL_CFLAGS = -DCURL_STATICLIB
1630
+ CURL_LIBCURL = -ldl
1631
+ else
1632
+ ifndef CURL_LDFLAGS
1633
+ CURL_LDFLAGS = $(eval CURL_LDFLAGS := $$(shell $$(CURL_CONFIG) --libs))$(CURL_LDFLAGS)
1634
+ endif
1635
+ CURL_LIBCURL += $(CURL_LDFLAGS)
1621
1636
endif
1622
- CURL_LIBCURL += $(CURL_LDFLAGS)
1623
1637
1624
1638
ifndef CURL_CFLAGS
1625
1639
CURL_CFLAGS = $(eval CURL_CFLAGS := $$(shell $$(CURL_CONFIG) --cflags))$(CURL_CFLAGS)
@@ -1640,7 +1654,7 @@ else
1640
1654
endif
1641
1655
ifdef USE_CURL_FOR_IMAP_SEND
1642
1656
BASIC_CFLAGS += -DUSE_CURL_FOR_IMAP_SEND
1643
- IMAP_SEND_BUILDDEPS = http.o
1657
+ IMAP_SEND_BUILDDEPS = http.o $(LAZYLOAD_LIBCURL_OBJ)
1644
1658
IMAP_SEND_LDFLAGS += $(CURL_LIBCURL)
1645
1659
endif
1646
1660
ifndef NO_EXPAT
@@ -2812,10 +2826,10 @@ git-imap-send$X: imap-send.o $(IMAP_SEND_BUILDDEPS) GIT-LDFLAGS $(GITLIBS)
2812
2826
$(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
2813
2827
$(IMAP_SEND_LDFLAGS ) $(LIBS )
2814
2828
2815
- git-http-fetch$X : http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS )
2829
+ git-http-fetch$X : http.o http-walker.o http-fetch.o $( LAZYLOAD_LIBCURL_OBJ ) GIT-LDFLAGS $(GITLIBS )
2816
2830
$(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
2817
2831
$(CURL_LIBCURL ) $(LIBS )
2818
- git-http-push$X : http.o http-push.o GIT-LDFLAGS $(GITLIBS )
2832
+ git-http-push$X : http.o http-push.o $( LAZYLOAD_LIBCURL_OBJ ) GIT-LDFLAGS $(GITLIBS )
2819
2833
$(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
2820
2834
$(CURL_LIBCURL ) $(EXPAT_LIBEXPAT ) $(LIBS )
2821
2835
@@ -2825,7 +2839,7 @@ $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
2825
2839
ln -s $< $@ 2> /dev/null || \
2826
2840
cp $< $@
2827
2841
2828
- $(REMOTE_CURL_PRIMARY ) : remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS )
2842
+ $(REMOTE_CURL_PRIMARY ) : remote-curl.o http.o http-walker.o $( LAZYLOAD_LIBCURL_OBJ ) GIT-LDFLAGS $(GITLIBS )
2829
2843
$(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
2830
2844
$(CURL_LIBCURL ) $(EXPAT_LIBEXPAT ) $(LIBS )
2831
2845
0 commit comments