From owner-svn-src-all@FreeBSD.ORG Mon Jan 24 10:25:08 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A9FBB106566B; Mon, 24 Jan 2011 10:25:08 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.cksoft.de (mail.cksoft.de [IPv6:2001:4068:10::3]) by mx1.freebsd.org (Postfix) with ESMTP id 254A78FC17; Mon, 24 Jan 2011 10:25:08 +0000 (UTC) Received: from localhost (amavis.fra.cksoft.de [192.168.74.71]) by mail.cksoft.de (Postfix) with ESMTP id F1ED541C6B4; Mon, 24 Jan 2011 11:25:06 +0100 (CET) X-Virus-Scanned: amavisd-new at cksoft.de Received: from mail.cksoft.de ([192.168.74.103]) by localhost (amavis.fra.cksoft.de [192.168.74.71]) (amavisd-new, port 10024) with ESMTP id knd8j2tLh2cY; Mon, 24 Jan 2011 11:25:06 +0100 (CET) Received: by mail.cksoft.de (Postfix, from userid 66) id 4CF2E41C6A7; Mon, 24 Jan 2011 11:25:06 +0100 (CET) Received: from maildrop.int.zabbadoz.net (maildrop.int.zabbadoz.net [10.111.66.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.int.zabbadoz.net (Postfix) with ESMTP id 6BC324448F3; Mon, 24 Jan 2011 10:20:42 +0000 (UTC) Date: Mon, 24 Jan 2011 10:20:42 +0000 (UTC) From: "Bjoern A. Zeeb" X-X-Sender: bz@maildrop.int.zabbadoz.net To: Warner Losh In-Reply-To: <4D3D1BCC.8040502@bsdimp.com> Message-ID: <20110124101804.A3489@maildrop.int.zabbadoz.net> References: <201101222310.p0MNAwIY007637@svn.freebsd.org> <4D3D1BCC.8040502@bsdimp.com> X-OpenPGP-Key: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r217734 - head X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Mon, 24 Jan 2011 10:25:08 -0000 On Sun, 23 Jan 2011, Warner Losh wrote: > On 01/22/2011 16:10, Bjoern A. Zeeb wrote: >> Author: bz >> Date: Sat Jan 22 23:10:58 2011 >> New Revision: 217734 >> URL: http://svn.freebsd.org/changeset/base/217734 >> >> Log: >> In `make targets` print the make variable TARGETS as we expect it rather >> than the grammatically better sounding variant without the 'S'. This >> allows copy and paste and is less confusing. >> > > Also, 'make targets' explains which targets are supported by make buildworld, > not make universe. Again, please revert. I see. Unfortunately the sparse documentation didn't say that and the target is sitting in a section of the Makefile that starts with # # universe # (for obvious reasons). And being told I understand it. What about: http://people.freebsd.org/~bz/20110124-01-make-targets.diff ! ! Back out r217734. [1] ! ! Properly document what `make targets` is supposed to list to avoid ! further confusion given the place the target sits. Should have happened ! with r217125. ! ! Requested by: imp [1] ! Index: share/man/man7/build.7 =================================================================== --- share/man/man7/build.7 (revision 217774) +++ share/man/man7/build.7 (working copy) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 22, 2011 +.Dd January 24, 2011 .Dt BUILD 7 .Os .Sh NAME @@ -229,6 +229,12 @@ This command takes a long time. .It Cm update Get updated sources as configured in .Xr make.conf 5 . +.It Cm targets +Print a list of supported +.Va TARGET +/ +.Va TARGET_ARCH +pairs for world and kernel targets. .It Cm tinderbox Execute the same targets as .Cm universe . Index: Makefile =================================================================== --- Makefile (revision 217774) +++ Makefile (working copy) @@ -28,7 +28,8 @@ # delete-old-dirs - Delete obsolete directories. # delete-old-files - Delete obsolete files. # delete-old-libs - Delete obsolete libraries. -# targets - Print a list of supported TARGET/TARGET_ARCH pairs. +# targets - Print a list of supported TARGET/TARGET_ARCH pairs +# for world and kernel targets. # # This makefile is simple by design. The FreeBSD make automatically reads # the /usr/share/mk/sys.mk unless the -m argument is specified on the @@ -297,7 +298,7 @@ TARGET_ARCHES_${target}?= ${target} .endfor targets: - @echo "Supported TARGETS/TARGET_ARCH pairs" + @echo "Supported TARGET/TARGET_ARCH pairs for world and kernel targets" .for target in ${TARGETS} .for target_arch in ${TARGET_ARCHES_${target}} @echo " ${target}/${target_arch}" > Warner >> Modified: >> head/Makefile >> >> Modified: head/Makefile >> ============================================================================== >> --- head/Makefile Sat Jan 22 22:57:28 2011 (r217733) >> +++ head/Makefile Sat Jan 22 23:10:58 2011 (r217734) >> @@ -297,7 +297,7 @@ TARGET_ARCHES_${target}?= ${target} >> .endfor >> >> targets: >> - @echo "Supported TARGET/TARGET_ARCH pairs" >> + @echo "Supported TARGETS/TARGET_ARCH pairs" >> .for target in ${TARGETS} >> .for target_arch in ${TARGET_ARCHES_${target}} >> @echo " ${target}/${target_arch}" >> >> >> > -- Bjoern A. Zeeb You have to have visions! Going to jail sucks -- All my daemons like it! http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/jails.html