diff options
| author | bapt <bapt@FreeBSD.org> | 2015-11-07 11:02:33 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2015-11-07 11:02:33 +0000 |
| commit | 41e30bab0f71e46748531a3e41f2837349a21f1a (patch) | |
| tree | 0fd2d3a4c334f196b901e4e32fd6cc566b269fa5 /tools/build | |
| parent | 1f0016890f772d6be4ffc3faff26931611d4feae (diff) | |
| parent | c2f5f67bd969f6441e91fc8cb611561eaef8426c (diff) | |
| download | FreeBSD-src-41e30bab0f71e46748531a3e41f2837349a21f1a.zip FreeBSD-src-41e30bab0f71e46748531a3e41f2837349a21f1a.tar.gz | |
Merge from head r290483
Diffstat (limited to 'tools/build')
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 9 | ||||
| -rw-r--r-- | tools/build/options/WITH_FAST_DEPEND | 7 | ||||
| -rwxr-xr-x | tools/build/options/makeman | 4 |
3 files changed, 16 insertions, 4 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 7f55347..aba1885 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -6827,8 +6827,7 @@ OLD_FILES+=usr/share/man/man8/repquota.8.gz .if ${MK_RCMDS} == no OLD_FILES+=bin/rcp OLD_FILES+=etc/rc.d/rwho -OLD_FILES+=etc/periodic/daily/140.clean-rwho -OLD_FILES+=etc/periodic/daily/430.status-rwho +OLD_FILES+=etc/periodic/daily/140.clean-rwho OLD_FILES+=rescue/rcp OLD_FILES+=usr/bin/rlogin OLD_FILES+=usr/bin/rsh @@ -8339,6 +8338,12 @@ OLD_FILES+=usr/share/man/man3/usb_set_configuration.3.gz OLD_FILES+=usr/share/man/man3/usb_set_debug.3.gz OLD_FILES+=usr/share/man/man3/usb_strerror.3.gz OLD_FILES+=usr/share/man/man3/usbhid.3.gz +OLD_FILES+=usr/share/man/man4/if_otus.4.gz +OLD_FILES+=usr/share/man/man4/if_rsu.4.gz +OLD_FILES+=usr/share/man/man4/otus.4.gz +OLD_FILES+=usr/share/man/man4/otusfw.4.gz +OLD_FILES+=usr/share/man/man4/rsu.4.gz +OLD_FILES+=usr/share/man/man4/rsufw.4.gz OLD_FILES+=usr/share/man/man4/u3g.4.gz OLD_FILES+=usr/share/man/man4/u3gstub.4.gz OLD_FILES+=usr/share/man/man4/uark.4.gz diff --git a/tools/build/options/WITH_FAST_DEPEND b/tools/build/options/WITH_FAST_DEPEND new file mode 100644 index 0000000..2597a36 --- /dev/null +++ b/tools/build/options/WITH_FAST_DEPEND @@ -0,0 +1,7 @@ +.\" $FreeBSD$ +Set to generate +.Sy .depend +files in the build during compilation instead of the +historial +.Xr mkdep 1 +call during the "make depend" phase. diff --git a/tools/build/options/makeman b/tools/build/options/makeman index 1595499..c0c12b1 100755 --- a/tools/build/options/makeman +++ b/tools/build/options/makeman @@ -33,7 +33,7 @@ show_options() ALL_TARGETS=$(echo $(${make} targets | tail -n +2)) rm -f $t/settings for target in ${ALL_TARGETS} ; do - ${make} showconfig \ + env -i ${make} showconfig \ SRC_ENV_CONF=/dev/null SRCCONF=/dev/null \ __MAKE_CONF=/dev/null \ TARGET_ARCH=${target#*/} TARGET=${target%/*} | @@ -97,7 +97,7 @@ show() exit 1 ;; esac - ${make} .MAKE.MODE=normal "$@" showconfig __MAKE_CONF=/dev/null \ + env -i ${make} .MAKE.MODE=normal "$@" showconfig __MAKE_CONF=/dev/null \ SRCCONF=/dev/null | while read var _ val ; do opt=${var#MK_} |
