From owner-svn-src-all@freebsd.org Mon Jun 5 05:17:37 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 65CF2BF7144; Mon, 5 Jun 2017 05:17:37 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 2960A713E6; Mon, 5 Jun 2017 05:17:37 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v555HaJi014302; Mon, 5 Jun 2017 05:17:36 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v555HabF014301; Mon, 5 Jun 2017 05:17:36 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201706050517.v555HabF014301@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Mon, 5 Jun 2017 05:17:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r319592 - head/share/mk 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.23 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: Mon, 05 Jun 2017 05:17:37 -0000 Author: bdrewery Date: Mon Jun 5 05:17:36 2017 New Revision: 319592 URL: https://svnweb.freebsd.org/changeset/base/319592 Log: META_MODE: Allow not ignoring host headers with NO_META_IGNORE_HOST_HEADERS. See r301467 for more details on NO_META_IGNORE_HOST. Usually the full list of host ignores should have no real impact on the host tools. The headers however may reliably define what the ABI is for the host. It may be useful to allow using the headers for the build but still not caring about things like /bin/sh, /lib/libedit.so, etc. Sponsored by: Dell EMC Isilon Modified: head/share/mk/sys.mk Modified: head/share/mk/sys.mk ============================================================================== --- head/share/mk/sys.mk Sun Jun 4 21:58:02 2017 (r319591) +++ head/share/mk/sys.mk Mon Jun 5 05:17:36 2017 (r319592) @@ -70,7 +70,8 @@ META_MODE+= missing-filemon=yes META_MODE?= normal .export META_MODE .MAKE.MODE?= ${META_MODE} -.if !empty(.MAKE.MODE:Mmeta) && !defined(NO_META_IGNORE_HOST) +.if !empty(.MAKE.MODE:Mmeta) +.if !defined(NO_META_IGNORE_HOST) # Ignore host file changes that will otherwise cause # buildworld -> installworld -> buildworld to rebuild everything. # Since the build is self-reliant and bootstraps everything it needs, @@ -85,17 +86,20 @@ META_MODE?= normal /rescue \ /sbin \ /usr/bin \ - /usr/include \ /usr/lib \ /usr/sbin \ /usr/share \ +.else +NO_META_IGNORE_HOST_HEADERS= 1 .endif -.if !empty(.MAKE.MODE:Mmeta) +.if !defined(NO_META_IGNORE_HOST_HEADERS) +.MAKE.META.IGNORE_PATHS+= /usr/include +.endif # We do not want everything out-of-date just because # some unrelated shared lib updated this. .MAKE.META.IGNORE_PATHS+= /usr/local/etc/libmap.d -.endif +.endif # !empty(.MAKE.MODE:Mmeta) .if ${MK_AUTO_OBJ} == "yes" # This needs to be done early - before .PATH is computed