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)
David O'Brien
obrien at FreeBSD.org
Fri Oct 26 16:34:21 UTC 2012
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 at FreeBSD.org)
More information about the freebsd-arch
mailing list