From 2a033d37eae00a7301e1967fd483094d7d38a966 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 23 Jul 2016 23:07:38 -0700 Subject: [PATCH] maint: skip a check when en_US.UTF-8 collation rules are broken * cfg.mk (sc_THANKS_in_sorted): This check would fail on systems for which "." is not ignored. Add a quick sort-based check for that error, and skip the check on any broken system. This also corrects the command to use $(srcdir)/THANKS.in, rather than just THANKS.in. --- cfg.mk | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/cfg.mk b/cfg.mk index f312682..14a81fa 100644 --- a/cfg.mk +++ b/cfg.mk @@ -132,15 +132,21 @@ sc_THANKS_in_duplicates: && { echo '$(ME): remove the above names from THANKS.in' \ 1>&2; exit 1; } || : -# Ensure the contributor list stays sorted. Use our sort as other -# implementations may result in a different order. +# Ensure the contributor list stays sorted. However, if the system's +# en_US.UTF-8 locale data is erroneous, give a diagnostic and skip +# this test. This affects OS X up to at least 10.11.6. sc_THANKS_in_sorted: - @sed '/^$$/,/^$$/!d;/^$$/d' THANKS.in > $@.1; \ - LC_ALL=en_US.UTF-8 sort -f -k1,1 $@.1 > $@.2 - @diff -u $@.1 $@.2; diff=$$?; \ - rm -f $@.1 $@.2; \ - test "$$diff" = 0 \ - || { echo '$(ME): THANKS.in is unsorted' 1>&2; exit 1; } + @printf '%s\n' ja j.b| LC_ALL=en_US.UTF-8 sort -c 2> /dev/null \ + && { \ + sed '/^$$/,/^$$/!d;/^$$/d' $(srcdir)/THANKS.in > $@.1 && \ + LC_ALL=en_US.UTF-8 sort -f -k1,1 $@.1 > $@.2 && \ + diff -u $@.1 $@.2; diff=$$?; \ + rm -f $@.1 $@.2; \ + test "$$diff" = 0 \ + || { echo '$(ME): THANKS.in is unsorted' 1>&2; exit 1; }; \ + } \ + || { echo '$(ME): this system has erroneous locale data;' \ + 'skipping $@' 1>&2; } update-copyright-env = \ UPDATE_COPYRIGHT_USE_INTERVALS=2 \