From owner-svn-src-head@freebsd.org  Fri Mar 17 18:08:37 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 71F7ED102B5;
 Fri, 17 Mar 2017 18:08: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 3F9071F4C;
 Fri, 17 Mar 2017 18:08: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 v2HI8afp060017;
 Fri, 17 Mar 2017 18:08:36 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2HI8anB060016;
 Fri, 17 Mar 2017 18:08:36 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201703171808.v2HI8anB060016@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 17 Mar 2017 18:08:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r315461 - 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-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Mar 2017 18:08:37 -0000

Author: bdrewery
Date: Fri Mar 17 18:08:36 2017
New Revision: 315461
URL: https://svnweb.freebsd.org/changeset/base/315461

Log:
  META_MODE: Fix not using .depend files when no OBJDIR is present.
  
  By default bmake does not allow meta mode to work unless an OBJDIR is
  present.  It allows this if curdirok= is set with a value not starting
  with [0NnFf], but usually it is "yes".
  
  MFC after:	2 weeks
  Sponsored by:	Dell EMC Isilon

Modified:
  head/share/mk/bsd.dep.mk

Modified: head/share/mk/bsd.dep.mk
==============================================================================
--- head/share/mk/bsd.dep.mk	Fri Mar 17 18:08:33 2017	(r315460)
+++ head/share/mk/bsd.dep.mk	Fri Mar 17 18:08:36 2017	(r315461)
@@ -75,6 +75,13 @@ tags: ${SRCS}
 .if !empty(.MAKE.MODE:Mmeta) && empty(.MAKE.MODE:Mnofilemon)
 _meta_filemon=	1
 .endif
+# By default META_MODE is disabled in bmake if there is no OBJDIR
+# unless .MAKE.MODE contains "curdirOk=[^0nNfF]"
+.if defined(_meta_filemon) && ${.OBJDIR} == ${.CURDIR} && \
+    (empty(.MAKE.MODE:tl:Mcurdirok=*) || \
+    !empty(.MAKE.MODE:tl:Mcurdirok=[0NnFf]*))
+.undef _meta_filemon
+.endif
 
 # Skip reading .depend when not needed to speed up tree-walks and simple
 # lookups.  See _SKIP_BUILD logic in bsd.init.mk for more details.