From adbb8a93d6908cb7a8caa5626e297b2b0122f4c2 Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Thu, 23 Feb 2017 14:39:51 +0000 Subject: make vi message catalogues build independent of locale r275234 addressed sort automatically converting 8-bit locales to UTF-8 by using "LANG=C sort", but LC_ALL overrides LANG if set, so the issue may still be present depending on the user's environment. Use LC_ALL=C instead. Reported by: tests.reproducible-builds.org Reviewed by: bapt MFC after: 1 week Sponsored by: The Linux Foundation / Core Infrastructure Initiative Differential Revision: https://reviews.freebsd.org/D9765 --- usr.bin/vi/catalog/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'usr.bin') diff --git a/usr.bin/vi/catalog/Makefile b/usr.bin/vi/catalog/Makefile index a045dbce9119..ba2fa9c9c7a4 100644 --- a/usr.bin/vi/catalog/Makefile +++ b/usr.bin/vi/catalog/Makefile @@ -39,7 +39,7 @@ CAT+= $c.UTF-8 ${c}: ${c}.base echo "... $c"; \ rm -f $c; \ - env LANG=C sort -u ${.ALLSRC} | \ + env LC_ALL=C sort -u ${.ALLSRC} | \ awk '{ \ if ($$1 == 1) { \ print "\nMESSAGE NUMBER 1 IS NOT LEGAL"; \ @@ -86,13 +86,13 @@ ${c}.check: ${c}.base echo =========================; \ echo "MESSAGES WITH THE SAME MESSAGE ID's (FIX!):"; \ for j in \ - `sed '/^$$/d' < $$f.base | LANG=C sort -u | \ + `sed '/^$$/d' < $$f.base | LC_ALL=C sort -u | \ awk '{print $$1}' | uniq -d`; do \ egrep $$j $$f.base; \ done; \ echo =========================; \ echo "Duplicate messages, both id and message (this is okay):"; \ - sed '/^$$/d' < $$f.base | LANG=C sort | uniq -c | \ + sed '/^$$/d' < $$f.base | LC_ALL=C sort | uniq -c | \ awk '$$1 != 1 { print $$0 }' | sort -n; \ echo =========================) > $c .endfor -- cgit v1.2.3