Permalink
Browse files

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
  • Loading branch information...
1 parent 3945d6d commit d0b131ee670db80026e93a222847d936d58050cd @emaste emaste committed Feb 23, 2017
Showing with 3 additions and 3 deletions.
  1. +3 −3 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

0 comments on commit d0b131e

Please sign in to comment.