svn commit: r278193 - in head: lib share/mk tools/build/options usr.bin

Garrett Cooper ngie at FreeBSD.org
Wed Feb 4 10:24:42 UTC 2015


Author: ngie
Date: Wed Feb  4 10:24:40 2015
New Revision: 278193
URL: https://svnweb.freebsd.org/changeset/base/278193

Log:
  Add MK_FILE to control whether or not to build file(1), libmagic(3), etc
  
  MFC after: 2 weeks
  Sponsored by: EMC / Isilon Storage Division

Added:
  head/tools/build/options/WITHOUT_FILE   (contents, props changed)
Modified:
  head/lib/Makefile
  head/share/mk/src.opts.mk
  head/usr.bin/Makefile

Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile	Wed Feb  4 10:19:32 2015	(r278192)
+++ head/lib/Makefile	Wed Feb  4 10:24:40 2015	(r278193)
@@ -63,7 +63,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	libkvm \
 	${_libldns} \
 	liblzma \
-	libmagic \
+	${_libmagic} \
 	libmandoc \
 	libmemstat \
 	libmd \
@@ -195,6 +195,10 @@ _cuse=		libcuse
 _libelftc=	libelftc
 .endif
 
+.if ${MK_FILE} != "no"
+_libmagic=	libmagic
+.endif
+
 .if ${MK_GPIO} != "no"
 _libgpio=	libgpio
 .endif

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Wed Feb  4 10:19:32 2015	(r278192)
+++ head/share/mk/src.opts.mk	Wed Feb  4 10:24:40 2015	(r278193)
@@ -83,6 +83,7 @@ __DEFAULT_YES_OPTIONS = \
     ELFTOOLCHAIN_TOOLS \
     EXAMPLES \
     FDT \
+    FILE \
     FINGER \
     FLOPPY \
     FMTREE \

Added: head/tools/build/options/WITHOUT_FILE
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_FILE	Wed Feb  4 10:24:40 2015	(r278193)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr file 1
+and related programs.

Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile	Wed Feb  4 10:19:32 2015	(r278192)
+++ head/usr.bin/Makefile	Wed Feb  4 10:24:40 2015	(r278193)
@@ -48,7 +48,6 @@ SUBDIR=	${_addr2line} \
 	expand \
 	false \
 	fetch \
-	file \
 	find \
 	fmt \
 	fold \
@@ -246,6 +245,10 @@ _size=		size
 _strings=	strings
 .endif
 
+.if ${MK_FILE} != "no"
+SUBDIR+=	file
+.endif
+
 .if ${MK_FINGER} != "no"
 SUBDIR+=	finger
 .endif


More information about the svn-src-all mailing list