From owner-freebsd-arch@FreeBSD.ORG  Fri Oct 26 16:34:21 2012
Return-Path: <owner-freebsd-arch@FreeBSD.ORG>
Delivered-To: freebsd-arch@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 664)
 id 17FE0F3E; Fri, 26 Oct 2012 16:34:21 +0000 (UTC)
Date: Fri, 26 Oct 2012 09:34:20 -0700
From: David O'Brien <obrien@FreeBSD.org>
To: Garrett Cooper <yanegomi@gmail.com>
Subject: Re: Installing make as pmake when WITH_BMAKE specified (was Re:
 [CFT/RFC]: refactor bsd.prog.mk to understand multiple programs instead of
 a singular program)
Message-ID: <20121026163420.GE43045@dragon.NUXI.org>
Mail-Followup-To: obrien@freebsd.org, Garrett Cooper <yanegomi@gmail.com>,
 Marcel Moolenaar <marcel@xcllnt.net>, freebsd-hackers@freebsd.org,
 freebsd-arch@freebsd.org, "Simon J. Gerraty" <sjg@juniper.net>
References: <CAGH67wT8A9bjBH=wsFB6CC5agobS=SOvPZyGEAC8giAQMu8M2A@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAGH67wT8A9bjBH=wsFB6CC5agobS=SOvPZyGEAC8giAQMu8M2A@mail.gmail.com>
X-Operating-System: FreeBSD 10.0-CURRENT
X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN? can i haz chizburger?
User-Agent: Mutt/1.5.20 (2009-06-14)
Cc: "Simon J. Gerraty" <sjg@juniper.net>, freebsd-hackers@freebsd.org,
 freebsd-arch@freebsd.org, Marcel Moolenaar <marcel@xcllnt.net>
X-BeenThere: freebsd-arch@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: obrien@freebsd.org
List-Id: Discussion related to FreeBSD architecture <freebsd-arch.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-arch>,
 <mailto:freebsd-arch-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-arch>
List-Post: <mailto:freebsd-arch@freebsd.org>
List-Help: <mailto:freebsd-arch-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-arch>,
 <mailto:freebsd-arch-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Oct 2012 16:34:21 -0000

On Thu, Oct 25, 2012 at 03:00:21PM -0700, Garrett Cooper wrote:
> Here's an updated version of the workaround that works properly in all
> cases and installs bmake as make and links make to pmake when
> WITH_BMAKE=yes, and installs make as make when WITHOUT_BMAKE is
> specified (this works better than the previous patch I sent to Simon).

Garrett,
I don't see how this could be committed -- it will make it difficult
for 10-CURRENT folks to build ports (and there are no pre-build packages
for 10-CURRENT).

Are you not able to use this instead (w/"WANT_USRBIN_BMAKE=" in /etc/src.conf)?

Index: usr.bin/Makefile
===================================================================
--- usr.bin/Makefile	(revision 241927)
+++ usr.bin/Makefile	(working copy)
@@ -281,6 +281,9 @@ SUBDIR+=	msgs
 .if ${MK_BMAKE} != "no"
 SUBDIR+=	bmake
 .else
+.if defined(WANT_USRBIN_BMAKE)
+SUBDIR+=	bmake
+.endif
 SUBDIR+=	make
 .endif
 .endif

-- 
-- David  (obrien@FreeBSD.org)