[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: two ill effects of maint.mk
From: |
Bruno Haible |
Subject: |
Re: two ill effects of maint.mk |
Date: |
Mon, 21 Jun 2021 10:52:20 +0200 |
User-agent: |
KMail/5.1.3 (Linux/4.4.0-210-generic; KDE/5.18.0; x86_64; ; ) |
Hi Paul,
> > Can someone please deal with this? Simon? Akim? Berny? Not always me :-)
>
> Something like the attached patch perhaps? (I haven't tested or
> installed it.)
Thanks for working on this. Yes, this will revert the ill effects on
"make" and "make check".
> --- a/build-aux/gendocs.sh
> +++ b/build-aux/gendocs.sh
> @@ -34,6 +34,8 @@ scriptversion=2021-01-01.00
> # - images are not imported in the source tarball. All the needed
> # formats (PDF, PNG, etc.) should be included.
>
> +export LC_ALL=C
> +
> prog=`basename "$0"`
> srcdir=`pwd`
To make it work in other shells than bash-compatible shells, I think
it's better to write
LC_ALL=C; export LC_ALL
> --- a/build-aux/gnu-web-doc-update
> +++ b/build-aux/gnu-web-doc-update
> @@ -19,6 +19,8 @@ VERSION=2021-01-09.09; # UTC
> # You should have received a copy of the GNU General Public License
> # along with this program. If not, see <https://www.gnu.org/licenses/>.
>
> +export LC_ALL=C
> +
> ME=$(basename "$0")
> warn() { printf '%s: %s\n' "$ME" "$*" >&2; }
> die() { warn "$*"; exit 1; }
Likewise.
> --- a/build-aux/vc-list-files
> +++ b/build-aux/vc-list-files
> @@ -27,6 +27,8 @@ scriptversion=2018-03-07.03; # UTC
> # If there's an argument, it must be a single, "."-relative directory name.
> # cvsu is part of the cvsutils package: https://www.red-bean.com/cvsutils/
>
> +export LC_ALL=C
> +
> postprocess=
> case $1 in
> --help) cat <<EOF
Likewise.
Similarly in many places of maint.mk.
> @@ -111,7 +111,8 @@ ifeq ($(VC),$(GIT))
> this-vc-tag = v$(VERSION)
> this-vc-tag-regexp = v$(VERSION_REGEXP)
> else
> - tag-package = $(shell echo "$(PACKAGE)" | tr '[:lower:]' '[:upper:]')
> + tag-package = $(shell export LC_ALL=C; \
> + echo "$(PACKAGE)" | tr '[:lower:]' '[:upper:]')
> tag-this-version = $(subst .,_,$(VERSION))
> this-vc-tag = $(tag-package)-$(tag-this-version)
> this-vc-tag-regexp = $(this-vc-tag)
Since 'echo' is not locale dependent, it's easier to write this as
tag-package = $(shell echo "$(PACKAGE)" | LC_ALL=C tr '[:lower:]' '[:upper:]')
> @@ -1652,6 +1669,7 @@ update-copyright-env ?=
> # in the file .x-update-copyright.
> .PHONY: update-copyright
> update-copyright:
> + export LC_ALL=C; \
> $(AM_V_GEN)$(GREP) -l -w Copyright \
> $$(export VC_LIST_EXCEPT_DEFAULT=COPYING && $(VC_LIST_EXCEPT)) \
> | $(update-copyright-env) xargs $(srcdir)/$(_build-aux)/$@
The $(AM_V_GEN) is the thing that turns off verbosity. Therefore the
added statement should go after it, not before it.
> diff --git a/build-aux/gnupload b/build-aux/gnupload
> index e7822aed7..f70fe330a 100755
> --- a/build-aux/gnupload
> +++ b/build-aux/gnupload
> @@ -22,6 +22,7 @@ scriptversion=2021-04-11.09; # UTC
> # The master copy of this file is maintained in the gnulib Git repository.
> # Please send bug reports and feature requests to bug-gnulib@gnu.org.
>
> +export LC_ALL=C
> set -e
>
> GPG=gpg
gnupload works fine in non-English locales. (I use it occasionally in German
locale.) Therefore this part can be omitted.
Bruno
Re: two ill effects of maint.mk, Bruno Haible, 2021/06/20