From owner-freebsd-hackers@FreeBSD.ORG Sun Sep 2 23:22:51 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 5A680106566B; Sun, 2 Sep 2012 23:22:51 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-ob0-f182.google.com (mail-ob0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id 054A48FC0A; Sun, 2 Sep 2012 23:22:50 +0000 (UTC) Received: by obbun3 with SMTP id un3so10884469obb.13 for ; Sun, 02 Sep 2012 16:22:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=AMCHNmywqE/C5CRFErlb/yxxn3PPOAXgEM1zk1FsQlY=; b=wJlyaHff+3unaJY+QkUvAbmIwppQuhVnqZbS3vi4JLdVdr5kPLQ/mRSWwWo92RQjHC Ko1RhzTbuN3mSyc19nZrik7O/EmFqM0CR6TzabSTJeriNe5Hq4QJ3bxG9ctxkS3K5hxR NkItud6RjX1a+i7swCbiM9iyJ2KSjElsY33rwTt2D0Rsp56hjJqPzx96xCbDgis7qIhB tRqrxBn1HhmVB+EwDnxzMItGPLydbT1uE8JReAKo//SLMQs5v0E+0iTaE9kVejx+cn4E Z/nJNWTcYWhTY47upnCuahOnkPdcDWMVhMRTHDpa+Z3jZ6RMAHjTFTixCXJvu4r/yLcG C0bQ== MIME-Version: 1.0 Received: by 10.182.218.37 with SMTP id pd5mr12809766obc.24.1346628170073; Sun, 02 Sep 2012 16:22:50 -0700 (PDT) Received: by 10.76.142.201 with HTTP; Sun, 2 Sep 2012 16:22:50 -0700 (PDT) In-Reply-To: <20120902225250.GE1507@glenbarber.us> References: <20120902214616.GB1507@glenbarber.us> <20120902225250.GE1507@glenbarber.us> Date: Sun, 2 Sep 2012 16:22:50 -0700 Message-ID: From: Garrett Cooper To: Glen Barber Content-Type: text/plain; charset=ISO-8859-1 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 23:22:51 -0000 On Sun, Sep 2, 2012 at 3:52 PM, Glen Barber wrote: > 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} != "no"`. Other than that, LGTM! > > You're right, thanks. New diff attached. Cool|! Too bad we don't have a publicly advertised MK_DOC knob -- otherwise doc would be an optional EXTRA_DISTRIBUTION as well (there's an undocumented NODOC knob in release/Makefile) (yes bde@ -- feel free to cringe at gmail's suckage with column wrapping). Index: /usr/src/Makefile.inc1 =================================================================== --- /usr/src/Makefile.inc1 (revision 239292) +++ /usr/src/Makefile.inc1 (working copy) @@ -640,7 +640,13 @@ # # Non-base distributions produced by the base system -EXTRA_DISTRIBUTIONS= doc games +EXTRA_DISTRIBUTIONS= +.if ${MK_DOC} != "no" +EXTRA_DISTRIBUTIONS+= doc +.endif +.if ${MK_GAMES} != "no" +EXTRA_DISTRIBUTIONS+= games +.endif .if defined(LIB32TMP) && ${MK_LIB32} != "no" EXTRA_DISTRIBUTIONS+= lib32 .endif >> I would also dare to go one step further and remove >> `${WORLDTMP}/legacy/usr/games` from BPATH and XPATH when ${MK_GAMES} >> == "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. Sure. > Thank you for the suggestion. No problem! Thanks! -Garrett