Date: Fri, 26 Oct 2012 09:34:20 -0700 From: David O'Brien <obrien@FreeBSD.org> To: Garrett Cooper <yanegomi@gmail.com> Cc: "Simon J. Gerraty" <sjg@juniper.net>, freebsd-hackers@freebsd.org, freebsd-arch@freebsd.org, Marcel Moolenaar <marcel@xcllnt.net> 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> In-Reply-To: <CAGH67wT8A9bjBH=wsFB6CC5agobS=SOvPZyGEAC8giAQMu8M2A@mail.gmail.com> References: <CAGH67wT8A9bjBH=wsFB6CC5agobS=SOvPZyGEAC8giAQMu8M2A@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121026163420.GE43045>