From owner-svn-src-head@freebsd.org Wed Oct 14 22:09:57 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AA6B0A124E9; Wed, 14 Oct 2015 22:09:57 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 8635E892; Wed, 14 Oct 2015 22:09:57 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id 79EF31B78; Wed, 14 Oct 2015 22:09:57 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 2E5CEF1A5; Wed, 14 Oct 2015 22:09:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id Eqg-SrH91vJD; Wed, 14 Oct 2015 22:09:54 +0000 (UTC) Subject: Re: svn commit: r289334 - head/share/mk DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com BE8FAF19F To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201510142030.t9EKUWNY089355@repo.freebsd.org> From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: <561ED2B3.4030909@FreeBSD.org> Date: Wed, 14 Oct 2015 15:09:55 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <201510142030.t9EKUWNY089355@repo.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="0hsEibXHIorXP6jVuu9g7sgsWqkN8RRk1" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Oct 2015 22:09:57 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --0hsEibXHIorXP6jVuu9g7sgsWqkN8RRk1 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 10/14/2015 1:30 PM, Bryan Drewery wrote: > Author: bdrewery > Date: Wed Oct 14 20:30:32 2015 > New Revision: 289334 > URL: https://svnweb.freebsd.org/changeset/base/289334 >=20 > Log: > Recurse on 'buildconfig' and 'installconfig'. Remove the 'config' ps= eudo target. > =20 > The 'config' target isn't really needed right now so just remove it t= o avoid > any clashes with config(8) building. It's also likely misspelled and= should > be 'configs' if we decide to add it back. This was just a convenienc= e > target recently added. > =20 > Sponsored by: EMC / Isilon Storage Division >=20 > Modified: > head/share/mk/bsd.subdir.mk >=20 > Modified: head/share/mk/bsd.subdir.mk > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/share/mk/bsd.subdir.mk Wed Oct 14 20:28:15 2015 (r289333) > +++ head/share/mk/bsd.subdir.mk Wed Oct 14 20:30:32 2015 (r289334) > @@ -32,9 +32,10 @@ > .if !target(____) > ____: > =20 > -ALL_SUBDIR_TARGETS=3D all all-man checkdpadd clean cleandepend cleandi= r \ > - cleanilinks cleanobj depend distribute lint maninstall \ > - manlint obj objlink realinstall regress tags \ > +ALL_SUBDIR_TARGETS=3D all all-man buildconfig checkdpadd clean cleande= pend \ > + cleandir cleanilinks cleanobj depend distribute \ > + installconfig lint maninstall manlint obj objlink \ > + realinstall regress tags \ > ${SUBDIR_TARGETS} > =20 > .include > @@ -127,7 +128,7 @@ _sub.${__target}: _SUBDIR > # This is to support 'make includes' calling 'make buildincludes' and > # 'make installincludes' in the proper order, and to support these > # targets as SUBDIR_TARGETS. > -.for __target in files includes config > +.for __target in files includes > .for __stage in build install > ${__stage}${__target}: > .if make(${__stage}${__target}) >=20 So the reason I have been tinkering with this code is because it is so mysterious to me, given the lack of comments and seemingly out-of-place nature of it. It turns out that even moving 'buildconfig' as a recurse target creates a surprising situation that will break with parallel builds since 'buildconfig' is hooked into 'all', thus 'all' and 'buildconfig' both end up recursing when calling 'make all'. This explains the make() check here to avoid recursing if called with 'all' (even though it is checking the opposite, only calling 'buildconfig' directly to recurse). Comments are not a sin. --=20 Regards, Bryan Drewery --0hsEibXHIorXP6jVuu9g7sgsWqkN8RRk1 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJWHtK0AAoJEDXXcbtuRpfPLwQH/2PmES4tpfH80FS1guIBBdn5 rChwywAaBCo4ZVYYsmdJdT6zrvuW7FgGj+H5MsFH7Mo0WbJRiJnwuwP3cGgqQN6j FU9e8ae+Vm0g51yM/qzi43r5xPBHTj65X++Ccfe9pgXmUl1GPql9bMQZAkQPgIQv CLwIuRSYcDl/0xBfPBx4rKm/UW1Uz/iesMBuGHDwcVoltx53LOFz5VZRV95vETou wfgWVEAqyTunA+c7bVivq+qAVJniZYo6P2DeZk3q9P+CN81VCwQR8ixwu3YNb3VR gcanYe7JMAB6Y5nDHRapmMK+rT5Yta5i7Q+LgXH1eaQD+UwPNa9QW9yHZE59/Jo= =iudd -----END PGP SIGNATURE----- --0hsEibXHIorXP6jVuu9g7sgsWqkN8RRk1--