From 6822cc82fa8966635b5a3bf8ae8c50acd8646d66 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 27 May 2024 11:02:12 -0700 Subject: [PROPOSED 1/2] =?UTF-8?q?=E2=80=98make=20check=E2=80=99=20no=20lo?= =?UTF-8?q?nger=20depends=20on=20curl+Internet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Makefile (check_theory.html, check_tz-art.html) (check_tz-how-to.html, check_tz-link.html): Silently succeed if curl is missing. This supports ‘make check’ on platforms lacking curl, and on platforms not connected to the Internet. --- Makefile | 6 ++++-- NEWS | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4d2ac1cf..a067f4ae 100644 --- a/Makefile +++ b/Makefile @@ -484,6 +484,7 @@ KSHELL= /bin/bash # Name of curl , used for HTML validation # and to fetch leap-seconds.list from upstream. +# Set CURL=: to disable use of the Internet. CURL= curl # Name of GNU Privacy Guard , used to sign distributions. @@ -992,8 +993,9 @@ check_tz-art.html: tz-art.html check_tz-how-to.html: tz-how-to.html check_tz-link.html: tz-link.html check_theory.html check_tz-art.html check_tz-how-to.html check_tz-link.html: - $(CURL) -sS --url https://validator.w3.org/nu/ -F out=gnu \ - -F file=@$$(expr $@ : 'check_\(.*\)') -o $@.out && \ + { ! ($(CURL) --version) >/dev/null 2>&1 || \ + $(CURL) -sS --url https://validator.w3.org/nu/ -F out=gnu \ + -F file=@$$(expr $@ : 'check_\(.*\)'); } >$@.out && \ test ! -s $@.out || { cat $@.out; exit 1; } mv $@.out $@ diff --git a/NEWS b/NEWS index 596a67ab..b3f9ce20 100644 --- a/NEWS +++ b/NEWS @@ -59,6 +59,10 @@ Unreleased, experimental changes can overrun user buffers. If you still need them, add -DSUPPORT_POSIX2008 to CFLAGS. + Changes to build procedure + + 'make check' no longer requires curl and Internet access. + Release 2024a - 2024-02-01 09:28:56 -0800 -- 2.43.0