I think it is a lot simpler to not generate the echo's in the first place :-) env MAKEVERBOSE=4 make -f mkvars.mk mkvars MAKEVERBOSE=0 christos > On Aug 28, 2023, at 3:55 PM, Palle Lyckegaard <palle%lyckegaard.dk@localhost> wrote: > > The following reply was made to PR toolchain/57584; it has been noted by GNATS. > > From: Palle Lyckegaard <palle%lyckegaard.dk@localhost> > To: gnats-bugs%netbsd.org@localhost > Cc: toolchain-manager%netbsd.org@localhost, gnats-admin%netbsd.org@localhost, > netbsd-bugs%netbsd.org@localhost > Subject: Re: toolchain/57584: Running build.sh with -N 3 or -N 4 causes debug > logging to be included in the MKVARS shell variable in > distrib/sets/sets.subr > Date: Mon, 28 Aug 2023 19:50:02 +0000 (UTC) > > On Fri, 18 Aug 2023, Palle Lyckegaard wrote: > >> I've managed to fix the issue with the following patch (removing lines >> with the string 'echo'): >> >> diff --git a/distrib/sets/sets.subr b/distrib/sets/sets.subr >> index 6f2223181713..61546167b956 100644 >> --- a/distrib/sets/sets.subr >> +++ b/distrib/sets/sets.subr >> @@ -129,7 +129,7 @@ done >> >> IFS=$oIFS >> >> -MKVARS="$( MAKEVERBOSE= ${MAKE} -B -f ${rundir}/mkvars.mk mkvars | ${SED} >> -e 's,=.*,,' | ${XARGS} )" >> +MKVARS="$( MAKEVERBOSE= ${MAKE} -B -f ${rundir}/mkvars.mk mkvars | ${SED} >> -e 's,=.*,,' -e 's,echo.*,,'| ${XARGS} )" >> >> ##### >> > > > > Updated patch: > > diff --git a/distrib/sets/sets.subr b/distrib/sets/sets.subr > index 6f2223181713..77babdaa8f04 100644 > --- a/distrib/sets/sets.subr > +++ b/distrib/sets/sets.subr > @@ -129,7 +129,10 @@ done > > IFS=$oIFS > > -MKVARS="$( MAKEVERBOSE= ${MAKE} -B -f ${rundir}/mkvars.mk mkvars | ${SED} > -e 's,=.*,,' | ${XARGS} )" > +# The construction of the MKVARS variable includes some filtering out of > the string 'echo' since > +# mkvars.mk has a number of "@echo" commands that pollutes the output > when building with MAKEVERBOSE=3 or > +# MAKEVERBOSE=4 > +MKVARS="$( MAKEVERBOSE= ${MAKE} -B -f ${rundir}/mkvars.mk mkvars | > ${GREP} -v 'echo' | ${SED} -e 's,=.*,,' | ${XARGS} )" > > ##### > > > Comments? >
Attachment:
signature.asc
Description: Message signed with OpenPGP