From owner-svn-src-all@FreeBSD.ORG Wed Feb 4 10:24:41 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E9B15251; Wed, 4 Feb 2015 10:24:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BB827C0F; Wed, 4 Feb 2015 10:24:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14AOfKK052426; Wed, 4 Feb 2015 10:24:41 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14AOe9a052421; Wed, 4 Feb 2015 10:24:40 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502041024.t14AOe9a052421@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 4 Feb 2015 10:24:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278193 - in head: lib share/mk tools/build/options usr.bin X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 10:24:42 -0000 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