From owner-svn-src-stable@freebsd.org  Tue Jan  3 22:55:11 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 ED008C9E9EA;
 Tue,  3 Jan 2017 22:55:11 +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 A1E0E171F;
 Tue,  3 Jan 2017 22:55:11 +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 v03MtAnA043207;
 Tue, 3 Jan 2017 22:55:10 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v03MtAtq043206;
 Tue, 3 Jan 2017 22:55:10 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201701032255.v03MtAtq043206@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: Tue, 3 Jan 2017 22:55:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r311185 - in stable/11: share/mk usr.sbin/crunch/crunchgen
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jan 2017 22:55:12 -0000

Author: bdrewery
Date: Tue Jan  3 22:55:10 2017
New Revision: 311185
URL: https://svnweb.freebsd.org/changeset/base/311185

Log:
  MFC r305254:
  
    META_MODE/DIRDEPS_BUILD: Fix various issues with crunch builds.

Modified:
  stable/11/share/mk/bsd.crunchgen.mk
  stable/11/usr.sbin/crunch/crunchgen/crunchgen.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/share/mk/bsd.crunchgen.mk
==============================================================================
--- stable/11/share/mk/bsd.crunchgen.mk	Tue Jan  3 22:52:24 2017	(r311184)
+++ stable/11/share/mk/bsd.crunchgen.mk	Tue Jan  3 22:55:10 2017	(r311185)
@@ -123,11 +123,13 @@ ${OUTPUTS}: ${CONF}
 
 # These 2 targets cannot use .MAKE since they depend on the generated
 # ${OUTMK} above.
-${PROG}: ${OUTPUTS} objs .META
+${PROG}: ${OUTPUTS} objs .NOMETA .PHONY
 	${CRUNCHENV} \
 	    CC="${CC} ${CFLAGS} ${LDFLAGS}" \
 	    CXX="${CXX} ${CXXFLAGS} ${LDFLAGS}" \
-	    ${MAKE} .MAKE.MODE=normal -f ${OUTMK} exe
+	    ${MAKE} .MAKE.MODE="${.MAKE.MODE} curdirOk=yes" \
+	    .MAKE.META.IGNORE_PATHS="${.MAKE.META.IGNORE_PATHS}" \
+	    -f ${OUTMK} exe
 
 objs: ${OUTMK} .META
 	${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} \
@@ -167,3 +169,4 @@ clean:
 	fi
 
 META_XTRAS+=	${find ${CRUNCHOBJS}${SRCTOP} -name '*.meta' 2>/dev/null || true:L:sh}
+META_XTRAS+=	${PROG}.meta

Modified: stable/11/usr.sbin/crunch/crunchgen/crunchgen.c
==============================================================================
--- stable/11/usr.sbin/crunch/crunchgen/crunchgen.c	Tue Jan  3 22:52:24 2017	(r311184)
+++ stable/11/usr.sbin/crunch/crunchgen/crunchgen.c	Tue Jan  3 22:55:10 2017	(r311185)
@@ -1064,6 +1064,7 @@ prog_makefile_rules(FILE *outmk, prog_t 
 		}
 		fprintf(outmk, "\n");
 	}
+	fprintf(outmk, "$(%s_OBJPATHS): .NOMETA\n", p->ident);
 
 	if (p->srcdir && p->objs) {
 		fprintf(outmk, "%s_SRCDIR=%s\n", p->ident, p->srcdir);