From owner-svn-src-head@freebsd.org Sat May 21 01:31:50 2016 Return-Path: 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 94FFDB43830; Sat, 21 May 2016 01:31:50 +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 F3E0B197B; Sat, 21 May 2016 01:31:49 +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 u4L1VmOg032915; Sat, 21 May 2016 01:31:48 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4L1VmjQ032913; Sat, 21 May 2016 01:31:48 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201605210131.u4L1VmjQ032913@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 21 May 2016 01:31:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r300343 - in head: share/mk sys/conf 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.22 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 May 2016 01:31:50 -0000 Author: bdrewery Date: Sat May 21 01:31:48 2016 New Revision: 300343 URL: https://svnweb.freebsd.org/changeset/base/300343 Log: WITH_META_MODE: Fix suffix transformation rules with guessed dependencies. This is the same problem as r290629. With META_MODE we do not generate .depend files, so there is no proper dependency to lookup. Guessed dependencies must be used. If this proves to be a problem then we will have to generate and use .depend files even with META_MODE. Sponsored by: EMC / Isilon Storage Division Modified: head/share/mk/bsd.dep.mk head/sys/conf/kern.post.mk Modified: head/share/mk/bsd.dep.mk ============================================================================== --- head/share/mk/bsd.dep.mk Sat May 21 01:31:44 2016 (r300342) +++ head/share/mk/bsd.dep.mk Sat May 21 01:31:48 2016 (r300343) @@ -216,6 +216,12 @@ afterdepend: beforedepend (!defined(_meta_filemon) && !exists(${.OBJDIR}/${DEPENDFILE}.${__obj})) ${__obj}: ${OBJS_DEPEND_GUESS} ${__obj}: ${OBJS_DEPEND_GUESS.${__obj}} +.elif defined(_meta_filemon) +# For meta mode we still need to know which file to depend on to avoid +# ambiguous suffix transformation rules from .PATH. Meta mode does not +# use .depend files. We really only need source files, not headers. +${__obj}: ${OBJS_DEPEND_GUESS:N*.h} +${__obj}: ${OBJS_DEPEND_GUESS.${__obj}:N*.h} .endif .endfor Modified: head/sys/conf/kern.post.mk ============================================================================== --- head/sys/conf/kern.post.mk Sat May 21 01:31:44 2016 (r300342) +++ head/sys/conf/kern.post.mk Sat May 21 01:31:48 2016 (r300343) @@ -247,6 +247,14 @@ beforebuild: kernel-depend ${__obj}: ${OBJS_DEPEND_GUESS} .endif ${__obj}: ${OBJS_DEPEND_GUESS.${__obj}} +.elif defined(_meta_filemon) +# For meta mode we still need to know which file to depend on to avoid +# ambiguous suffix transformation rules from .PATH. Meta mode does not +# use .depend files. We really only need source files, not headers. +.if ${SYSTEM_OBJS:M${__obj}} +${__obj}: ${OBJS_DEPEND_GUESS:N*.h} +.endif +${__obj}: ${OBJS_DEPEND_GUESS.${__obj}:N*.h} .endif .endfor