Date: Sun, 2 Sep 2012 18:52:50 -0400 From: Glen Barber <gjb@FreeBSD.org> To: Garrett Cooper <yanegomi@gmail.com> Cc: hackers@freebsd.org Subject: Re: [PATCH] head/Makefile.inc1: Fix 'make distributeworld' when defining WITHOUT_GAMES Message-ID: <20120902225250.GE1507@glenbarber.us> In-Reply-To: <CAGH67wSEhTqDft7C9VZy4h82xrkjjq7w9Y%2B-apynUMK4Pwycsg@mail.gmail.com> References: <20120902214616.GB1507@glenbarber.us> <CAGH67wQpgdqnXSeRUnUACQHNWJi-Z9ZEsB6ZQZ7Bf_W2nXyUKg@mail.gmail.com> <CAGH67wSEhTqDft7C9VZy4h82xrkjjq7w9Y%2B-apynUMK4Pwycsg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 <yanegomi@gmail.com> wrote:
> > On Sun, Sep 2, 2012 at 2:46 PM, Glen Barber <gjb@freebsd.org> 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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120902225250.GE1507>