From owner-freebsd-hackers@FreeBSD.ORG Sun Sep 2 22:52:53 2012 Return-Path: Delivered-To: hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E3766106566C; Sun, 2 Sep 2012 22:52:53 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from onyx.glenbarber.us (onyx.glenbarber.us [IPv6:2607:fc50:1000:c200::face]) by mx1.freebsd.org (Postfix) with ESMTP id AB8148FC08; Sun, 2 Sep 2012 22:52:53 +0000 (UTC) Received: from glenbarber.us (75.97.141.105.res-cmts.sewb.ptd.net [75.97.141.105]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: gjb) by onyx.glenbarber.us (Postfix) with ESMTPSA id A5B2A23F645; Sun, 2 Sep 2012 18:52:52 -0400 (EDT) Date: Sun, 2 Sep 2012 18:52:50 -0400 From: Glen Barber To: Garrett Cooper Message-ID: <20120902225250.GE1507@glenbarber.us> References: <20120902214616.GB1507@glenbarber.us> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="SdvjNjn6lL3tIsv0" Content-Disposition: inline In-Reply-To: X-Operating-System: FreeBSD 10.0-CURRENT amd64 User-Agent: Mutt/1.5.21 (2010-09-15) Cc: hackers@freebsd.org Subject: Re: [PATCH] head/Makefile.inc1: Fix 'make distributeworld' when defining WITHOUT_GAMES X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Sep 2012 22:52:54 -0000 --SdvjNjn6lL3tIsv0 Content-Type: multipart/mixed; boundary="w/VI3ydZO+RcZ3Ux" Content-Disposition: inline --w/VI3ydZO+RcZ3Ux Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Sep 02, 2012 at 03:12:01PM -0700, Garrett Cooper wrote: > On Sun, Sep 2, 2012 at 3:05 PM, Garrett Cooper wrote: > > On Sun, Sep 2, 2012 at 2:46 PM, Glen Barber wrote: > >> Hi, > >> > >> Attached patch fixes 'make distributeworld' and our 'make release' > >> scripts when WITHOUT_GAMES is set. > >> > >> Can someone please comment/test/commit? > > > > It should be `.if ${MK_GAMES} !=3D "no"`. Other than that, LGTM! You're right, thanks. New diff attached. >=20 > I would also dare to go one step further and remove > `${WORLDTMP}/legacy/usr/games` from BPATH and XPATH when ${MK_GAMES} > =3D=3D "no" to reduce the number of path lookups done (this should help > speed up the build a bit). Considering how many problems I am finding in our 'make release' build infrastructure, I would rather not do anything daringly right away. I would rather fix the bugs I am finding, be sure things are not broken differently, and then we can further fix things. Thank you for the suggestion. Glen --w/VI3ydZO+RcZ3Ux Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="head-Makefile.inc1.diff.txt" Content-Transfer-Encoding: quoted-printable Index: Makefile.inc1 =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 --- Makefile.inc1 (revision 240060) +++ Makefile.inc1 (working copy) @@ -636,7 +636,10 @@ # =20 # Non-base distributions produced by the base system -EXTRA_DISTRIBUTIONS=3D doc games +EXTRA_DISTRIBUTIONS=3D doc +.if ${MK_GAMES} !=3D "no" +EXTRA_DISTRIBUTIONS+=3D games +.endif .if defined(LIB32TMP) && ${MK_LIB32} !=3D "no" EXTRA_DISTRIBUTIONS+=3D lib32 .endif --w/VI3ydZO+RcZ3Ux-- --SdvjNjn6lL3tIsv0 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iQEcBAEBCAAGBQJQQ+NCAAoJEFJPDDeguUajtyEH/128f4/UsjqK+N+JhtxmJk3Y Tb+7flcIUzlFLe2QVWq5qBhZlayUrl3iyhC1aPphnu5NeYljT8j3PwEdIVAOcSn2 08aHpKIxZEYZOk2H15Asq3+DADLhCfElsJw1m64okcKtacSYUw+FCeJATQwm+h6r gIcoZmaPyFq1mCw6WY7OVHoLEAVxd4jAgQHzOtSVbgBSCNx1mRBRq7oSCdJZRnS6 uxJUieF61s5xuZSZhWf/Rw1DPcvGD+pa4qsSJEla6/Sf9If77Btr89R261eDMs0l I6UzeSzXlXvoHLjlCfTmxKCVWk1B7bRhciyb/CLdvA7MAX9jI0A1nVT3bL+DH7c= =xgRf -----END PGP SIGNATURE----- --SdvjNjn6lL3tIsv0--