@@ -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
@@ -1597,10 +1602,19 @@ else
1597
1602
CURL_LIBCURL =
1598
1603
endif
1599
1604
1600
- ifndef CURL_LDFLAGS
1601
- CURL_LDFLAGS = $(eval CURL_LDFLAGS := $$(shell $$(CURL_CONFIG) --libs))$(CURL_LDFLAGS)
1605
+ ifdef LAZYLOAD_LIBCURL
1606
+ LAZYLOAD_LIBCURL_OBJ = compat/lazyload-curl.o
1607
+ OBJECTS += $(LAZYLOAD_LIBCURL_OBJ)
1608
+ # The `CURL_STATICLIB` constant must be defined to avoid seeing the functions
1609
+ # declared as DLL imports
1610
+ CURL_CFLAGS = -DCURL_STATICLIB
1611
+ CURL_LIBCURL = -ldl
1612
+ else
1613
+ ifndef CURL_LDFLAGS
1614
+ CURL_LDFLAGS = $(eval CURL_LDFLAGS := $$(shell $$(CURL_CONFIG) --libs))$(CURL_LDFLAGS)
1615
+ endif
1616
+ CURL_LIBCURL += $(CURL_LDFLAGS)
1602
1617
endif
1603
- CURL_LIBCURL += $(CURL_LDFLAGS)
1604
1618
1605
1619
ifndef CURL_CFLAGS
1606
1620
CURL_CFLAGS = $(eval CURL_CFLAGS := $$(shell $$(CURL_CONFIG) --cflags))$(CURL_CFLAGS)
@@ -1621,7 +1635,7 @@ else
1621
1635
endif
1622
1636
ifdef USE_CURL_FOR_IMAP_SEND
1623
1637
BASIC_CFLAGS += -DUSE_CURL_FOR_IMAP_SEND
1624
- IMAP_SEND_BUILDDEPS = http.o
1638
+ IMAP_SEND_BUILDDEPS = http.o $(LAZYLOAD_LIBCURL_OBJ)
1625
1639
IMAP_SEND_LDFLAGS += $(CURL_LIBCURL)
1626
1640
endif
1627
1641
ifndef NO_EXPAT
@@ -2785,10 +2799,10 @@ git-imap-send$X: imap-send.o $(IMAP_SEND_BUILDDEPS) GIT-LDFLAGS $(GITLIBS)
2785
2799
$(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
2786
2800
$(IMAP_SEND_LDFLAGS ) $(LIBS )
2787
2801
2788
- git-http-fetch$X : http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS )
2802
+ git-http-fetch$X : http.o http-walker.o http-fetch.o $( LAZYLOAD_LIBCURL_OBJ ) GIT-LDFLAGS $(GITLIBS )
2789
2803
$(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
2790
2804
$(CURL_LIBCURL ) $(LIBS )
2791
- git-http-push$X : http.o http-push.o GIT-LDFLAGS $(GITLIBS )
2805
+ git-http-push$X : http.o http-push.o $( LAZYLOAD_LIBCURL_OBJ ) GIT-LDFLAGS $(GITLIBS )
2792
2806
$(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
2793
2807
$(CURL_LIBCURL ) $(EXPAT_LIBEXPAT ) $(LIBS )
2794
2808
@@ -2798,7 +2812,7 @@ $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
2798
2812
ln -s $< $@ 2> /dev/null || \
2799
2813
cp $< $@
2800
2814
2801
- $(REMOTE_CURL_PRIMARY ) : remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS )
2815
+ $(REMOTE_CURL_PRIMARY ) : remote-curl.o http.o http-walker.o $( LAZYLOAD_LIBCURL_OBJ ) GIT-LDFLAGS $(GITLIBS )
2802
2816
$(QUIET_LINK )$(CC ) $(ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
2803
2817
$(CURL_LIBCURL ) $(EXPAT_LIBEXPAT ) $(LIBS )
2804
2818
0 commit comments