Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 23 Feb 2017 14:39:52 +0000 (UTC)
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r314139 - head/usr.bin/vi/catalog
Message-ID:  <201702231439.v1NEdqrj003399@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: emaste
Date: Thu Feb 23 14:39:51 2017
New Revision: 314139
URL: https://svnweb.freebsd.org/changeset/base/314139

Log:
  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

Modified:
  head/usr.bin/vi/catalog/Makefile

Modified: head/usr.bin/vi/catalog/Makefile
==============================================================================
--- head/usr.bin/vi/catalog/Makefile	Thu Feb 23 13:14:28 2017	(r314138)
+++ head/usr.bin/vi/catalog/Makefile	Thu Feb 23 14:39:51 2017	(r314139)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702231439.v1NEdqrj003399>