1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-10 09:42:26 +00:00

Merge from CheriBSD:

commit 2d581e8caf79d7a0f5a24590eccd06da90cccb74
Author: Brooks Davis <brooks@one-eyed-alien.net>
Date:   Mon Jan 27 22:57:51 2014 +0000

    Add WITHOUT_FMTREE to disable building fmtree.

MFC after:	4 weeks
Sponsored by:	DARPA, AFRL
This commit is contained in:
Brooks Davis 2014-01-30 21:37:43 +00:00
parent a85228f164
commit 8f26887dfb
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=261299
4 changed files with 14 additions and 1 deletions

View File

@ -275,6 +275,7 @@ __DEFAULT_YES_OPTIONS = \
ED_CRYPTO \
EXAMPLES \
FLOPPY \
FMTREE \
FORMAT_EXTENSIONS \
FORTH \
FP_LIBC \

View File

@ -600,6 +600,11 @@ OLD_FILES+=usr/bin/g++
OLD_FILES+=usr/libexec/cc1plus
.endif
.if ${MK_FMTREE} == no
OLD_FILES+=usr/sbin/fmtree
OLD_FILES+=usr/share/man/man8/fmtree.8.gz
.endif
.if ${MK_GNUCXX} == no
OLD_FILES+=usr/bin/g++
OLD_FILES+=usr/include/c++/4.2/algorithm

View File

@ -0,0 +1,3 @@
.\" $FreeBSD$
Set to not build and install
.Pa /usr/sbin/fmtree .

View File

@ -48,7 +48,7 @@ SUBDIR= adduser \
mountd \
mptutil \
mtest \
mtree \
${_mtree} \
newsyslog \
nfscbd \
nfsd \
@ -142,6 +142,10 @@ SUBDIR+= fdread
SUBDIR+= fdwrite
.endif
.if ${MK_FMTREE} != "no"
SUBDIR+= mtree
.endif
.if ${MK_FREEBSD_UPDATE} != "no"
SUBDIR+= freebsd-update
.endif