d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make vi message catalogues build independent of locale

Browse Source 
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
This commit is contained in:
Ed Maste 2017-02-23 14:39:51 +00:00
parent d908d2ef5e
commit adbb8a93d6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=314139
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.bin/vi/catalog/Makefile
View File

@ -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