diff options
| author | ngie <ngie@FreeBSD.org> | 2015-03-01 22:07:54 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-03-01 22:07:54 +0000 |
| commit | 0625beb8de1c92c92b9a71b50d566b21604c1b35 (patch) | |
| tree | 96a8ccf0f7b5b35e19e643b5fc4a1f55a0825d26 | |
| parent | de8fb43ec92b1b420147d22f7a048a179f90fa76 (diff) | |
| download | FreeBSD-src-0625beb8de1c92c92b9a71b50d566b21604c1b35.zip FreeBSD-src-0625beb8de1c92c92b9a71b50d566b21604c1b35.tar.gz | |
MFC r278193:
Add MK_FILE to control whether or not to build file(1), libmagic(3), etc
Sponsored by: EMC / Isilon Storage Division
| -rw-r--r-- | lib/Makefile | 6 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 1 | ||||
| -rw-r--r-- | tools/build/options/WITHOUT_FILE | 4 | ||||
| -rw-r--r-- | usr.bin/Makefile | 5 |
4 files changed, 14 insertions, 2 deletions
diff --git a/lib/Makefile b/lib/Makefile index 21471f6..c5dfc48 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -59,7 +59,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ libkvm \ ${_libldns} \ liblzma \ - libmagic \ + ${_libmagic} \ libmandoc \ libmemstat \ libmd \ @@ -171,6 +171,10 @@ _libbsnmp= libbsnmp _clang= clang .endif +.if ${MK_FILE} != "no" +_libmagic= libmagic +.endif + .if ${MK_GPIB} != "no" _libgpib= libgpib .endif diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index d9461bd..0ca3af1 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -280,6 +280,7 @@ __DEFAULT_YES_OPTIONS = \ ED_CRYPTO \ EE \ EXAMPLES \ + FILE \ FINGER \ FLOPPY \ FMTREE \ diff --git a/tools/build/options/WITHOUT_FILE b/tools/build/options/WITHOUT_FILE new file mode 100644 index 0000000..636d00a --- /dev/null +++ b/tools/build/options/WITHOUT_FILE @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr file 1 +and related programs. diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 785fdd6..0682183 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -45,7 +45,6 @@ SUBDIR= alias \ expand \ false \ fetch \ - file \ find \ fmt \ fold \ @@ -230,6 +229,10 @@ _clang= clang SUBDIR+= ee .endif +.if ${MK_FILE} != "no" +SUBDIR+= file +.endif + .if ${MK_FINGER} != "no" SUBDIR+= finger .endif |
