diff options
| author | ian <ian@FreeBSD.org> | 2018-03-23 20:20:04 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2018-03-23 20:20:04 +0000 |
| commit | 75e47fd878562851b056469f61758637b919bd3e (patch) | |
| tree | ba5bd64e157470dbd88b01decb06c8ef6455b0e1 /share | |
| parent | 3392884117e3bf4bfcd14d9576e8c6177330caa4 (diff) | |
| download | FreeBSD-src-75e47fd878562851b056469f61758637b919bd3e.zip FreeBSD-src-75e47fd878562851b056469f61758637b919bd3e.tar.gz | |
MFC r307656, r307659, r307674-r307675, r307679, r307683
Support for WITHOUT_GNU_DIFF and WITHOUT_GNU_GREP, plus manually
regenerated src.conf.5, which seems to have picked up a couple changes
beyond what was in this MFC.
r307656:
Put each SUBDIR on a separate line for ease of maintenance
Additional patches to this file are in progress, and having each SUBDIR
entry on a separate line makes it easier to change the order in which
the patches are reviewed, tested, and applied.
r307659:
Switch gnu/usr.bin/Makefile to SUBDIR.${MK_*} optional subdir style
r307674:
Add knobs to make GNU diff and GNU grep optional
This is added to facilitate experiments building FreeBSD without
copyleft software.
If WITHOUT_GNU_DIFF is set no /usr/bin/diff or /usr/bin/diff3 will
be built.
If WITHOUT_GNU_GREP is set then BSD grep will be installed as
/usr/bin/bsdgrep or /usr/bin/grep, depending on the WITH_BSD_GREP
knob.
Reviewed by: brooks (earlier)
Sponsored by: The FreeBSD Foundation
Differential Revision: Differential Revision: https://reviews.freebsd.org/D8288
r307675:
Remove trailing whitespace from r307674
r307679:
Build libgnuregex only if necessary for other components
Reviewed by: brooks
Differential Revision: https://reviews.freebsd.org/D8298
r307683:
Correct typo in r307679: the variable is MK_GNU_GREP_COMPAT
Diffstat (limited to 'share')
| -rw-r--r-- | share/man/man5/src.conf.5 | 17 | ||||
| -rw-r--r-- | share/mk/src.opts.mk | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 4f7660b..9830f1a 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd January 8, 2018 +.Dd March 23, 2018 .Dt SRC.CONF 5 .Os .Sh NAME @@ -392,6 +392,8 @@ When set, it enforces these options: .Va WITHOUT_ELFTOOLCHAIN_BOOTSTRAP .It .Va WITHOUT_GCC_BOOTSTRAP +.It +.Va WITHOUT_LLD_BOOTSTRAP .El .It Va WITHOUT_CRYPT Set to not build any crypto code. @@ -731,6 +733,14 @@ This is the default on platforms where gcc is the system compiler. .Pp This is a default setting on mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64. +.It Va WITHOUT_GNU_DIFF +Set to not build GNU +.Xr diff 1 +and +.Xr diff3 1 . +.It Va WITHOUT_GNU_GREP +Set to not build GNU +.Xr grep 1 . .It Va WITHOUT_GNU_GREP_COMPAT Set this option to omit the gnu extensions to grep from being included in BSD grep. @@ -982,6 +992,11 @@ Set to use LLVM's libunwind stack unwinder (instead of GCC's unwinder). .Pp This is a default setting on arm64/aarch64. +.It Va WITH_LOADER_FIREWIRE +Enable firewire support in /boot/loader and /boot/zfsloader on x86. +This option is a nop on all other platforms. +.It Va WITHOUT_LOADER_GELI +Disable inclusion of GELI crypto support in the boot chain binaries. .It Va WITHOUT_LOCALES Set to not build localization files; see .Xr locale 1 . diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 9e277c3..eee4139 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -100,6 +100,8 @@ __DEFAULT_YES_OPTIONS = \ GCOV \ GDB \ GNU \ + GNU_DIFF \ + GNU_GREP \ GNU_GREP_COMPAT \ GPIO \ GPL_DTC \ |
