pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk mk/subst.mk: run diff in the default locale



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e5bb87bf190d
branches:  trunk
changeset: 425431:e5bb87bf190d
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Mar 21 19:26:12 2020 +0000

description:
mk/subst.mk: run diff in the default locale

The diff program is only used to produce informative output in the build
logs, nevertheless its output might be translated if there are lines that
do not end with a newline.

diffstat:

 mk/subst.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 78fe6482ead9 -r e5bb87bf190d mk/subst.mk
--- a/mk/subst.mk       Sat Mar 21 18:59:56 2020 +0000
+++ b/mk/subst.mk       Sat Mar 21 19:26:12 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: subst.mk,v 1.67 2020/03/21 13:30:35 rillig Exp $
+# $NetBSD: subst.mk,v 1.68 2020/03/21 19:26:12 rillig Exp $
 #
 # The subst framework replaces text in one or more files in the WRKSRC
 # directory. Packages can define several ``classes'' of replacements.
@@ -121,7 +121,7 @@
 SUBST_FILTER_CMD.${_class_}+=  -e s,@${v:C|[^A-Za-z0-9_]|\\\\&|gW:Q}@,${${v}:S|\\|\\\\|gW:S|,|\\,|gW:S|&|\\\&|gW:S|${.newline}|\\${.newline}|gW:Q},g
 .  endfor
 .  if ${SUBST_SHOW_DIFF.${_class_}:U${SUBST_SHOW_DIFF}:tl} == yes
-_SUBST_KEEP.${_class_}?=       ${DIFF} -u "$$file" "$$tmpfile" || true
+_SUBST_KEEP.${_class_}?=       LC_ALL=C ${DIFF} -u "$$file" "$$tmpfile" || true
 .  endif
 _SUBST_KEEP.${_class_}?=       ${DO_NADA}
 SUBST_SKIP_TEXT_CHECK.${_class_}?=     no



Home | Main Index | Thread Index | Old Index