Fix generation of src.conf.5

Since makeman turns all options on, we need to guard somethings from
make(showconfig)

10 files changed, 50 insertions, 3 deletions

diff --git a/tools/build/options/WITH_AUTO_OBJ b/tools/build/options/WITH_AUTO_OBJ
new file mode 100644
index 000000000000..9f2e2db3617a
--- /dev/null
+++ b/tools/build/options/WITH_AUTO_OBJ
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Enable automatic creation of objdirs.
diff --git a/tools/build/options/WITH_DIRDEPS_CACHE b/tools/build/options/WITH_DIRDEPS_CACHE
new file mode 100644
index 000000000000..7bb46220fa49
--- /dev/null
+++ b/tools/build/options/WITH_DIRDEPS_CACHE
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Cache result of dirdeps.mk which can save significant time
+for subsequent builds.
+Depends on
+.Va WITH_META_MODE .
diff --git a/tools/build/options/WITH_META_FILES b/tools/build/options/WITH_META_FILES
new file mode 100644
index 000000000000..ab19d3d7f15f
--- /dev/null
+++ b/tools/build/options/WITH_META_FILES
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Create meta files during non META_MODE build.
+The meta files can be useful for debugging.
diff --git a/tools/build/options/WITH_META_MODE b/tools/build/options/WITH_META_MODE
new file mode 100644
index 000000000000..16e79ae1c511
--- /dev/null
+++ b/tools/build/options/WITH_META_MODE
@@ -0,0 +1,20 @@
+.\" $FreeBSD$
+Enable building in meta mode.
+.Pp
+The build is driven by dirdeps.mk using DIRDEPS stored in
+Makefile.depend files found in each directory.
+.Pp
+The build can be started from anywhere, and behaves the same.
+The initial instance of make recursively reads DIRDEPS from Makefile.depend
+computing a graph of tree dependencies from the current origin.
+See http://www.crufty.net/help/sjg/dirdeps.htm
+.Pp
+As each target is made
+.Xr make 1
+produces a meta file which is used to capture (and compare)
+the command line,
+as well as any command output.
+If
+.Xr filemon 4
+is available the meta file will also capture a record of syscalls
+used to produce the target.
diff --git a/tools/build/options/WITH_STAGING b/tools/build/options/WITH_STAGING
new file mode 100644
index 000000000000..36ec818a6daa
--- /dev/null
+++ b/tools/build/options/WITH_STAGING
@@ -0,0 +1,7 @@
+.\" $FreeBSD$
+Enable staging of files to a stage tree.
+This can be best thought of as auto-install to
+.Va DESTDIR
+with some extra meta data to ensure dependencies can be tracked.
+Depends on
+.Va WITH_META_MODE .
diff --git a/tools/build/options/WITH_STAGING_MAN b/tools/build/options/WITH_STAGING_MAN
new file mode 100644
index 000000000000..474b45d0213d
--- /dev/null
+++ b/tools/build/options/WITH_STAGING_MAN
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Enable staging of MAN pages to stage tree.
diff --git a/tools/build/options/WITH_STAGING_PROG b/tools/build/options/WITH_STAGING_PROG
new file mode 100644
index 000000000000..2e401baac55f
--- /dev/null
+++ b/tools/build/options/WITH_STAGING_PROG
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Enable staging of PROGs to stage tree.
diff --git a/tools/build/options/WITH_STALE_STAGED b/tools/build/options/WITH_STALE_STAGED
new file mode 100644
index 000000000000..8bd874e5df98
--- /dev/null
+++ b/tools/build/options/WITH_STALE_STAGED
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Check staged files are not stale.
diff --git a/tools/build/options/WITH_SYSROOT b/tools/build/options/WITH_SYSROOT
new file mode 100644
index 000000000000..64c0fc8197ba
--- /dev/null
+++ b/tools/build/options/WITH_SYSROOT
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Enable use of sysroot during build.
+Depends on
+.Va WITH_META_MODE .
diff --git a/tools/build/options/makeman b/tools/build/options/makeman
index 8d419ce8c15c..4247ff23b3d9 100755
--- a/tools/build/options/makeman
+++ b/tools/build/options/makeman
@@ -46,7 +46,7 @@ show_options()
 				echo ${opt}
 				;;
 			*)
-				echo "make showconfig broken: ${val} is not yes or no" >&2
+				echo "make showconfig broken: ${var} ${_} ${val} (not yes or no)" >&2
 				exit 1
 				;;
 			esac
@@ -96,7 +96,7 @@ show()
 		exit 1
 		;;
 	esac
-	${make} "$@" showconfig __MAKE_CONF=/dev/null |
+	${make} .MAKE.MODE=normal "$@" showconfig __MAKE_CONF=/dev/null |
 	while read var _ val ; do
 		opt=${var#MK_}
 		case ${val} in
@@ -107,7 +107,7 @@ show()
 			echo ${no_prefix}_${opt}
 			;;
 		*)
-			echo "make showconfig broken: ${val} is not yes or no" >&2
+			echo "make showconfig broken: ${var} ${_} ${val} (not yes or no)" >&2
 			exit 1
 			;;
 		esac