diff options
| author | rillig <rillig@pkgsrc.org> | 2020-03-21 19:26:12 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2020-03-21 19:26:12 +0000 |
| commit | 0ac988589f66d01cca53787e40fc4abf0246c798 (patch) | |
| tree | 39516c77f0621636bbb1b318a92326c49f98766f /mk/subst.mk | |
| parent | 7368ce6c8c9b0269ebe593ee65f797c4e65ac8cd (diff) | |
| download | pkgsrc-0ac988589f66d01cca53787e40fc4abf0246c798.tar.gz | |
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 (limited to 'mk/subst.mk')
| -rw-r--r-- | mk/subst.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/subst.mk b/mk/subst.mk index 2d413607f5b..149e091473d 100644 --- a/mk/subst.mk +++ b/mk/subst.mk @@ -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_MESSAGE.${_class_}?= Substituting "${_class_}" in ${SUBST_FILES.${_class_} 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 |