From owner-svn-src-all@FreeBSD.ORG Sun Mar 15 23:04:49 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 42C9AF1D for ; Sun, 15 Mar 2015 23:04:49 +0000 (UTC) Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CBD215F6 for ; Sun, 15 Mar 2015 23:04:48 +0000 (UTC) Received: by wibg7 with SMTP id g7so21064791wib.1 for ; Sun, 15 Mar 2015 16:04:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:message-id:date:user-agent:mime-version:to :subject:references:in-reply-to:content-type :content-transfer-encoding; bh=Hh2rKcFlKHBCPoHIbNI0vzr+3ArKcdddOiPYT4OAGHs=; b=Y/4iQJB7qgjM9SCz8Edj3LQtu4svDSv5c/hYXtN/y+KTQr7QnSPDnYdfmqVMoL75gA t8iXQDVOWzlnQV7a0TLOISq0AQ/14djtm8wWrzg93vxE026csRrUeJowgKo+0cV6S28R W68aDUiKcJ+qqztHqzbaaX2TKSuT2j9SO8k9pa5EeIoKU1ntM9LX+asIUcwnTsEVSELn vR1txStBOOPs9Zs9kDEgaTiex3BMV6vB2RhUeOQyVk5HYlYWRAwag+vtOy4oLY1Os436 A5CNquAa0sqoDlTRlATajaQ+zcQwWsMSHt6aZLJd5ot5QI/RkQFegG8t/OVOd6JWqF4B Sg7g== X-Gm-Message-State: ALoCoQn8UDOZ+BtsNlgvho+LZoYrKlZDyX/C8mDTnfnXSLuJnC4tO4XpPpRIrdn39gTsQMNNbrbR X-Received: by 10.194.75.193 with SMTP id e1mr113955083wjw.126.1426460681347; Sun, 15 Mar 2015 16:04:41 -0700 (PDT) Received: from [10.10.1.68] (82-69-141-170.dsl.in-addr.zen.co.uk. [82.69.141.170]) by mx.google.com with ESMTPSA id pa4sm12787222wjb.11.2015.03.15.16.04.40 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Mar 2015 16:04:40 -0700 (PDT) From: Steven Hartland X-Google-Original-From: Steven Hartland Message-ID: <55061002.4070005@freebsd.org> Date: Sun, 15 Mar 2015 23:04:34 +0000 User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Baptiste Daroussin , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r280122 - head/share/mk References: <201503152150.t2FLoxhQ004247@svn.freebsd.org> In-Reply-To: <201503152150.t2FLoxhQ004247@svn.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Mar 2015 23:04:49 -0000 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 >