Date: Sun, 15 Mar 2015 23:04:34 +0000 From: Steven Hartland <steven@multiplay.co.uk> To: Baptiste Daroussin <bapt@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r280122 - head/share/mk Message-ID: <55061002.4070005@freebsd.org> In-Reply-To: <201503152150.t2FLoxhQ004247@svn.freebsd.org> References: <201503152150.t2FLoxhQ004247@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This appears to break buildworld: make[4]: "/usr/home/smh/freebsd/base/head/share/mk/bsd.links.mk" line 10: Wrong number of words (1) in .for substitution list with 2 vars make[4]: Fatal errors encountered -- cannot continue make[4]: stopped in /usr/home/smh/freebsd/base/head/usr.bin/mandoc *** [cleandir_subdir_mandoc] Error code 1 On 15/03/2015 21:50, Baptiste Daroussin wrote: > Author: bapt > Date: Sun Mar 15 21:50:58 2015 > New Revision: 280122 > URL: https://svnweb.freebsd.org/changeset/base/280122 > > Log: > Symplify links installation by using multi variable for loop > > Using multi variable for loop not only simplify the code, it also ensures that > the LINKS and SYMLINKS input have the right number of words > > Differential Revision: https://reviews.freebsd.org/D2069 > Reviewed by: imp > > Modified: > head/share/mk/bsd.links.mk > > Modified: head/share/mk/bsd.links.mk > ============================================================================== > --- head/share/mk/bsd.links.mk Sun Mar 15 21:43:43 2015 (r280121) > +++ head/share/mk/bsd.links.mk Sun Mar 15 21:50:58 2015 (r280122) > @@ -7,25 +7,11 @@ > afterinstall: _installlinks > .ORDER: realinstall _installlinks > _installlinks: > -.if defined(LINKS) && !empty(LINKS) > - @set ${LINKS}; \ > - while test $$# -ge 2; do \ > - l=${DESTDIR}$$1; \ > - shift; \ > - t=${DESTDIR}$$1; \ > - shift; \ > - ${ECHO} $$t -\> $$l; \ > - ${INSTALL_LINK} $$l $$t; \ > - done; true > -.endif > -.if defined(SYMLINKS) && !empty(SYMLINKS) > - @set ${SYMLINKS}; \ > - while test $$# -ge 2; do \ > - l=$$1; \ > - shift; \ > - t=${DESTDIR}$$1; \ > - shift; \ > - ${ECHO} $$t -\> $$l; \ > - ${INSTALL_SYMLINK} $$l $$t; \ > - done; true > -.endif > +.for s t in ${LINKS} > + @${ECHO} "$t -> $s" ;\ > + ${INSTALL_LINK} $s $t > +.endfor > +.for s t in ${SYMLINKS} > + @${ECHO} "$t -> $s" ;\ > + ${INSTALL_SYMLINK} $s $t > +.endfor >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?55061002.4070005>