pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk mk: Set LC_ALL=C to avoid encoding issue with tr an...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ad119768f592
branches:  trunk
changeset: 405073:ad119768f592
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Fri Nov 22 18:04:49 2019 +0000

description:
mk: Set LC_ALL=C to avoid encoding issue with tr and sed

diffstat:

 mk/subst.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (24 lines):

diff -r edf17e7cb5ba -r ad119768f592 mk/subst.mk
--- a/mk/subst.mk       Fri Nov 22 18:04:20 2019 +0000
+++ b/mk/subst.mk       Fri Nov 22 18:04:49 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: subst.mk,v 1.61 2019/09/08 09:06:06 rillig Exp $
+# $NetBSD: subst.mk,v 1.62 2019/11/22 18:04:49 minskim Exp $
 #
 # The subst framework replaces text in one or more files in the WRKSRC
 # directory. Packages can define several ``classes'' of replacements.
@@ -83,12 +83,12 @@
 
 # _SUBST_IS_TEXT_FILE_CMD returns 0 if $$file is a text file.
 _SUBST_IS_TEXT_FILE_CMD?= \
-       [ -z "`${TR} -cd '\\0' < "$$file" | ${TR} '\\0' 'x'`" ]
+       [ -z "`LC_ALL=C ${TR} -cd '\\0' < "$$file" | ${TR} '\\0' 'x'`" ]
 
 .for _class_ in ${SUBST_CLASSES}
 _SUBST_COOKIE.${_class_}=      ${WRKDIR}/.subst_${_class_}_done
 
-SUBST_FILTER_CMD.${_class_}?=  ${SED} ${SUBST_SED.${_class_}}
+SUBST_FILTER_CMD.${_class_}?=  LC_ALL=C ${SED} ${SUBST_SED.${_class_}}
 SUBST_VARS.${_class_}?=                # none
 SUBST_MESSAGE.${_class_}?=     Substituting "${_class_}" in ${SUBST_FILES.${_class_}}
 .  for v in ${SUBST_VARS.${_class_}}



Home | Main Index | Thread Index | Old Index