pkgsrc-Changes archive

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

CVS commit: pkgsrc/mk



Module Name:    pkgsrc
Committed By:   minskim
Date:           Fri Nov 22 18:04:49 UTC 2019

Modified Files:
        pkgsrc/mk: subst.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/mk/subst.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/subst.mk
diff -u pkgsrc/mk/subst.mk:1.61 pkgsrc/mk/subst.mk:1.62
--- pkgsrc/mk/subst.mk:1.61     Sun Sep  8 09:06:06 2019
+++ pkgsrc/mk/subst.mk  Fri Nov 22 18:04:49 2019
@@ -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 @@ ECHO_SUBST_MSG?=    ${STEP_MSG}
 
 # _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