From owner-svn-src-all@freebsd.org Thu Feb 23 14:39:53 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 35C37CEBDF9; Thu, 23 Feb 2017 14:39:53 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0226DBF6; Thu, 23 Feb 2017 14:39:52 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1NEdq7D003400; Thu, 23 Feb 2017 14:39:52 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1NEdqrj003399; Thu, 23 Feb 2017 14:39:52 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201702231439.v1NEdqrj003399@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 23 Feb 2017 14:39:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314139 - head/usr.bin/vi/catalog X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Feb 2017 14:39:53 -0000 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