Source-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk mk: Handle pdksh issue with "set -e" in for loop.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bd55c242df92
branches:  trunk
changeset: 434879:bd55c242df92
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Jun 25 08:45:00 2020 +0000

description:
mk: Handle pdksh issue with "set -e" in for loop.

With our current version of pdksh, a "false && something" construct under
"set -e" conditions will continue as it does with other shells, but if the
construct is within a for loop then it exits, causing failures in the
substitution code.  An explicit "|| true" is necessary to avoid this.

Approved during the freeze by wiz.

diffstat:

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

diffs (18 lines):

diff -r edb830f3c49d -r bd55c242df92 mk/subst.mk
--- a/mk/subst.mk       Thu Jun 25 05:42:36 2020 +0000
+++ b/mk/subst.mk       Thu Jun 25 08:45:00 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: subst.mk,v 1.100 2020/06/16 18:13:54 rillig Exp $
+# $NetBSD: subst.mk,v 1.101 2020/06/25 08:45:00 jperkin Exp $
 #
 # The subst framework replaces text in one or more files in the WRKSRC
 # directory. Packages can define several ``classes'' of replacements.
@@ -221,7 +221,7 @@
                        noop_count="$$noop_count+";                     \
                        noop_patterns="$$noop_patterns$$noop_sep$$pattern"; \
                        noop_sep=" ";                                   \
-               };                                                      \
+               } || ${TRUE};                                           \
        done;                                                           \
        \
        case $$noop_count in                                            \



Home | Main Index | Thread Index | Old Index