| Message ID | patch-v2-3.8-76c2aa6e78d-20210910T105523Z-avarab@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | post-v2.33 "drop support for ancient curl" follow-up | expand |
On Fri, Sep 10, 2021 at 01:04:28PM +0200, Ævar Arnfjörð Bjarmason wrote: > In 1119a15b5c8 (http: drop support for curl < 7.11.1, 2021-07-30) > support for curl versions older than 7.11.1 was removed, and we > currently require at least version 7.19.4, see 644de29e220 (http: drop > support for curl < 7.19.4, 2021-07-30). > > In those changes this Makefile-specific check added in > 0890098780f (Decide whether to build http-push in the Makefile, > 2005-11-18) was missed, now that we're never going to use such an > ancient curl version we don't need to check that we have at least > 7.9.8 here. I have no idea what in http-push.c broke on versions older > than that. Nice catch. I was curious, and I think the issue was just that older versions did not have the curl_multi_* interface. > @@ -1436,15 +1436,8 @@ else > REMOTE_CURL_NAMES = $(REMOTE_CURL_PRIMARY) $(REMOTE_CURL_ALIASES) > PROGRAM_OBJS += http-fetch.o > PROGRAMS += $(REMOTE_CURL_NAMES) > - curl_check := $(shell (echo 070908; $(CURL_CONFIG) --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p) > - ifeq "$(curl_check)" "070908" > - ifndef NO_EXPAT > - PROGRAM_OBJS += http-push.o > - else > - EXCLUDED_PROGRAMS += git-http-push > - endif > - else > - EXCLUDED_PROGRAMS += git-http-push > + ifndef NO_EXPAT > + PROGRAM_OBJS += http-push.o > endif I wonder if this $(CURL_CONFIG) check could have been be problematic for some obscure platforms, if they set up CURL_{CFLAGS,LDFLAGS,LIBCURL} manually (rather than relying on curl-config). We do have one more similar check: > curl_check := $(shell (echo 072200; $(CURL_CONFIG) --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p) ...and nobody has complained either way, so perhaps it doesn't matter much. Anyway, I'm happy to see this now-useless code go away. :) -Peff
diff --git a/Makefile b/Makefile index 429c276058d..378f58b950d 100644 --- a/Makefile +++ b/Makefile @@ -1436,15 +1436,8 @@ else REMOTE_CURL_NAMES = $(REMOTE_CURL_PRIMARY) $(REMOTE_CURL_ALIASES) PROGRAM_OBJS += http-fetch.o PROGRAMS += $(REMOTE_CURL_NAMES) - curl_check := $(shell (echo 070908; $(CURL_CONFIG) --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p) - ifeq "$(curl_check)" "070908" - ifndef NO_EXPAT - PROGRAM_OBJS += http-push.o - else - EXCLUDED_PROGRAMS += git-http-push - endif - else - EXCLUDED_PROGRAMS += git-http-push + ifndef NO_EXPAT + PROGRAM_OBJS += http-push.o endif curl_check := $(shell (echo 072200; $(CURL_CONFIG) --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p) ifeq "$(curl_check)" "072200"
In 1119a15b5c8 (http: drop support for curl < 7.11.1, 2021-07-30) support for curl versions older than 7.11.1 was removed, and we currently require at least version 7.19.4, see 644de29e220 (http: drop support for curl < 7.19.4, 2021-07-30). In those changes this Makefile-specific check added in 0890098780f (Decide whether to build http-push in the Makefile, 2005-11-18) was missed, now that we're never going to use such an ancient curl version we don't need to check that we have at least 7.9.8 here. I have no idea what in http-push.c broke on versions older than that. This does not impact "NO_CURL" setups, as this is in the "else" branch after that check. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- Makefile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)