From owner-svn-src-all@FreeBSD.ORG Fri Aug 16 18:47:19 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0B271883; Fri, 16 Aug 2013 18:47:19 +0000 (UTC) (envelope-from sjg@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D34392A53; Fri, 16 Aug 2013 18:47:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7GIlIfE006141; Fri, 16 Aug 2013 18:47:18 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7GIlIGW006139; Fri, 16 Aug 2013 18:47:18 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201308161847.r7GIlIGW006139@svn.freebsd.org> From: "Simon J. Gerraty" Date: Fri, 16 Aug 2013 18:47:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r254419 - head/contrib/bmake 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.14 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: Fri, 16 Aug 2013 18:47:19 -0000 Author: sjg Date: Fri Aug 16 18:47:18 2013 New Revision: 254419 URL: http://svnweb.freebsd.org/changeset/base/254419 Log: Add .MAKE.ALWAYS_PASS_JOB_QUEUE knob (default yes) for backwards compatability. Modified: head/contrib/bmake/job.c head/contrib/bmake/make.1 Modified: head/contrib/bmake/job.c ============================================================================== --- head/contrib/bmake/job.c Fri Aug 16 16:55:39 2013 (r254418) +++ head/contrib/bmake/job.c Fri Aug 16 18:47:18 2013 (r254419) @@ -172,6 +172,14 @@ __RCSID("$NetBSD: job.c,v 1.175 2013/07/ # define STATIC static /* + * FreeBSD: traditionally .MAKE is not required to + * pass jobs queue to sub-makes. + * Use .MAKE.ALWAYS_PASS_JOB_QUEUE=no to disable. + */ +#define MAKE_ALWAYS_PASS_JOB_QUEUE ".MAKE.ALWAYS_PASS_JOB_QUEUE" +static int Always_pass_job_queue = TRUE; + +/* * error handling variables */ static int errors = 0; /* number of errors reported */ @@ -1360,7 +1368,7 @@ JobExec(Job *job, char **argv) (void)fcntl(0, F_SETFD, 0); (void)lseek(0, (off_t)0, SEEK_SET); - if (job->node->type & OP_MAKE) { + if (Always_pass_job_queue || (job->node->type & OP_MAKE)) { /* * Pass job token pipe to submakes. */ @@ -2226,6 +2234,9 @@ Job_Init(void) lastNode = NULL; + Always_pass_job_queue = getBoolean(MAKE_ALWAYS_PASS_JOB_QUEUE, + Always_pass_job_queue); + /* * There is a non-zero chance that we already have children. * eg after 'make -f- <