svn commit: r265828 - in head: share/mk tools/build/options usr.bin

Warner Losh imp at FreeBSD.org
Sat May 10 16:37:40 UTC 2014


Author: imp
Date: Sat May 10 16:37:39 2014
New Revision: 265828
URL: http://svnweb.freebsd.org/changeset/base/265828

Log:
  Optionally allow building the historical FreeBSD make program and
  install it as fmake. This defaults to no. This should be viewed as the
  first step towards evental migration of this historic code to ports
  and removal from the tree.

Added:
  head/tools/build/options/WITH_FMAKE   (contents, props changed)
Modified:
  head/share/mk/src.opts.mk
  head/usr.bin/Makefile

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Sat May 10 16:37:33 2014	(r265827)
+++ head/share/mk/src.opts.mk	Sat May 10 16:37:39 2014	(r265828)
@@ -165,6 +165,7 @@ __DEFAULT_NO_OPTIONS = \
     BSD_GREP \
     CLANG_EXTRAS \
     EISA \
+    FMAKE \
     HESIOD \
     LLDB \
     NAND \

Added: head/tools/build/options/WITH_FMAKE
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/build/options/WITH_FMAKE	Sat May 10 16:37:39 2014	(r265828)
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Causes the old FreeBSD 
+.Xr make 1
+program to be built and installed as fmake.
+

Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile	Sat May 10 16:37:33 2014	(r265827)
+++ head/usr.bin/Makefile	Sat May 10 16:37:39 2014	(r265828)
@@ -230,6 +230,10 @@ SUBDIR+=	calendar
 _clang=		clang
 .endif
 
+.if ${MK_FMAKE} != "no"
+SUBDIR+=	make
+.endif
+
 .if ${MK_GPL_DTC} != "yes"
 SUBDIR+=	dtc
 .endif


More information about the svn-src-head mailing list