On 3/21/21 10:24 PM, Paul Eggert wrote: > Today I updated Coreutils to current Gnulib, [...].
Thanks for getting rid of the diacrit module. The attached also updates the bootstrap script. BTW: what about a syntax-check rule to ensure we don't forget to sync files physically copied into 'coreutils.git', something (not much tested) like the following? Have a nice day, Berny diff --git a/cfg.mk b/cfg.mk index d65bda2fd..0d103f66b 100644 --- a/cfg.mk +++ b/cfg.mk @@ -797,6 +797,15 @@ sc_gitignore_missing: sort | uniq -u | grep . && { echo '$(ME): Add above' \ 'entries to .gitignore' >&2; exit 1; } || : +# Ensure that physical copies of gnulib files are in sync. +sc_gnulib_copies_compare: + @cd $(srcdir) \ + && diff COPYING gnulib/doc/COPYINGv3 \ + && diff bootstrap gnulib/build-aux/bootstrap \ + && diff tests/init.sh gnulib/tests/init.sh \ + || { echo '$(ME): files copied from gnulib out of sync' >&2; \ + exit 1; } + # Flag redundant entries in .gitignore # Disabled for now as too aggressive flagging # entries like /lib/arg-nonnull.h
>From 5747d0459cc8d25934513049ca7f90d767697bd2 Mon Sep 17 00:00:00 2001 From: Bernhard Voelker <m...@bernhard-voelker.de> Date: Mon, 22 Mar 2021 23:45:30 +0100 Subject: [PATCH] maint: update bootstrap from gnulib * bootstrap: Sync from gnulib/build-aux/bootstrap; the previous gnulib update (commit 1a3eb6c30) missed to update that file. --- bootstrap | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/bootstrap b/bootstrap index 7523f65b4..c17a36f1f 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2020-11-18.17; # UTC +scriptversion=2021-01-10.00; # UTC # Bootstrap this package from checked-out sources. @@ -47,7 +47,7 @@ PERL="${PERL-perl}" me=$0 -default_gnulib_url=git://git.sv.gnu.org/gnulib +default_gnulib_url=https://git.savannah.gnu.org/git/gnulib.git usage() { cat <<EOF @@ -184,7 +184,7 @@ po_download_command_format=\ https://translationproject.org/latest/%s/" # Prefer a non-empty tarname (4th argument of AC_INIT if given), else -# fall back to the package name (1st argument with munging) +# fall back to the package name (1st argument with munging). extract_package_name=' /^AC_INIT(\[*/{ s/// @@ -201,8 +201,11 @@ extract_package_name=' p } ' -package=$(sed -n "$extract_package_name" configure.ac) \ - || die 'cannot find package name in configure.ac' +package=$(${AUTOCONF:-autoconf} --trace AC_INIT:\$4 configure.ac 2>/dev/null) +if test -z "$package"; then + package=$(sed -n "$extract_package_name" configure.ac) \ + || die 'cannot find package name in configure.ac' +fi gnulib_name=lib$package build_aux=build-aux -- 2.30.2