From owner-svn-src-head@freebsd.org Wed Mar 30 03:59:15 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 69FE2AE2B52; Wed, 30 Mar 2016 03:59:15 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0136.outbound.protection.outlook.com [157.56.110.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "MSIT Machine Auth CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B9A8F12EE; Wed, 30 Mar 2016 03:59:13 +0000 (UTC) (envelope-from sjg@juniper.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=junipernetworks.onmicrosoft.com; s=selector1-juniper-net; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=r8C0tR0GwvqnScL/ezCyghpEIdYPxEr7h9qBiMaLk/I=; b=b0xjjHcckyvWoYGqp63y+5Wffk4cC7gDg7MZQxyxXsynECktaqgS1as6rYzV9PTwOzz9KQ27eFUFI3D5YTdqp4XOJ6yJr/qLDsJpgAcRz1/rrwrGBsZftED+696EkGFFPlp4zPUjht/MOOA2ApLkhfXRSOLU3TOrJP+V7cERB6k= Received: from DM2PR0501CA0013.namprd05.prod.outlook.com (10.162.29.151) by BN3PR05MB2674.namprd05.prod.outlook.com (10.166.72.26) with Microsoft SMTP Server (TLS) id 15.1.447.15; Wed, 30 Mar 2016 03:59:12 +0000 Received: from BL2FFO11OLC002.protection.gbl (2a01:111:f400:7c09::197) by DM2PR0501CA0013.outlook.office365.com (2a01:111:e400:5148::23) with Microsoft SMTP Server (TLS) id 15.1.447.15 via Frontend Transport; Wed, 30 Mar 2016 03:59:11 +0000 Authentication-Results: spf=softfail (sender IP is 66.129.239.19) smtp.mailfrom=juniper.net; freebsd.org; dkim=none (message not signed) header.d=none;freebsd.org; dmarc=none action=none header.from=juniper.net; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.239.19 as permitted sender) Received: from p-emfe01b-sac.jnpr.net (66.129.239.19) by BL2FFO11OLC002.mail.protection.outlook.com (10.173.161.186) with Microsoft SMTP Server (TLS) id 15.1.453.6 via Frontend Transport; Wed, 30 Mar 2016 03:59:11 +0000 Received: from magenta.juniper.net (172.17.27.123) by p-emfe01b-sac.jnpr.net (172.24.192.21) with Microsoft SMTP Server (TLS) id 14.3.123.3; Tue, 29 Mar 2016 20:59:05 -0700 Received: from kaos.jnpr.net (kaos.jnpr.net [172.21.16.84]) by magenta.juniper.net (8.11.3/8.11.3) with ESMTP id u2U3x4A61768; Tue, 29 Mar 2016 20:59:04 -0700 (PDT) (envelope-from sjg@juniper.net) Received: from kaos.jnpr.net (localhost [127.0.0.1]) by kaos.jnpr.net (Postfix) with ESMTP id 272EA385508; Tue, 29 Mar 2016 20:59:04 -0700 (PDT) To: Bryan Drewery CC: , , , Subject: Re: svn commit: r297040 - in head: contrib/bmake contrib/bmake/mk share/mk usr.bin/bmake In-Reply-To: <56FB096C.6030001@FreeBSD.org> References: <201603182003.u2IK39FS069664@repo.freebsd.org> <56FB096C.6030001@FreeBSD.org> Comments: In-reply-to: Bryan Drewery message dated "Tue, 29 Mar 2016 16:02:04 -0700." From: "Simon J. Gerraty" X-Mailer: MH-E 8.6; nmh 1.6; GNU Emacs 24.5.1 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <54143.1459310344.1@kaos.jnpr.net> Content-Transfer-Encoding: quoted-printable Date: Tue, 29 Mar 2016 20:59:04 -0700 Message-ID: <54145.1459310344@kaos.jnpr.net> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:66.129.239.19; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(189002)(199003)(24454002)(50226001)(23726003)(4001430100002)(76176999)(92566002)(50466002)(11100500001)(2810700001)(4326007)(1096002)(76506005)(53416004)(2906002)(86362001)(110136002)(1220700001)(107886002)(50986999)(77096005)(46406003)(81166005)(87936001)(117636001)(105596002)(450100001)(189998001)(6806005)(5008740100001)(97756001)(5003600100002)(586003)(106466001)(2950100001)(19580405001)(47776003)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:BN3PR05MB2674; H:p-emfe01b-sac.jnpr.net; FPR:; SPF:SoftFail; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC002; 1:I975BVvkHdVGz8NFJwUMixlhzSzIJDhTFzGLB9/2O0NStAxAW6NqtLhp26fr4hxIh9Vxi4YpsOrD94fG9WZTwnrtYcnkVl5JykSijaCTn+S8I0yvBtEMOiQ0V1+5l/PzfebYwa3y6AW6GnqYPqdEzaODLq5Dc9b1YurUt+daJP4NsdeS8vD8XbgSYp0kDn2gspJQ9nsmugbckfZJIv9pNN5j3FACqJAU6acZUHGl0AdPfunwSLxi0x3Iz3JsL/GrthKVcpYAcmS2TmGXeLQruHqLUwafi8fgw+8Fe96trb9/7hyZbne8ASs929BJpZbeLgZvxvNPMQ7wUVCZe7BUJSN+LoO60RbHA8Ta3LGhXw2frrXqfwDXCc0fFLFkX8BHFF7gCNmlGwCjebx4Cg7KkxY5VzyOCWfEgjBCkme8eYcp1acRYNr+M99TuS7apHgg X-MS-Office365-Filtering-Correlation-Id: 3a916551-6182-4687-3bf3-08d3584fa711 X-Microsoft-Exchange-Diagnostics: 1; BN3PR05MB2674; 2:69iLLvMAFX3wC2l15KKFxEIJHw683RtDW5p5skOe/tY0Cmrxn4RDW0n1k+7qRFrCdaTs1UZi3WRruhLFrMTCKzeC7YVjwuOesiafFNjg/zCR8REfwrA/xFpboQUWAxJLMat7gN24uHJ7Zk7yoRCcvFkWxfcSAY5IuRJpMr0F7kpG3Gzg415JE0g1nBLK/bER; 3:Mmw3s/WlpBeiCZCREkIdkbexLXeJDFgxzNPfZz8DopTzx+wAvVnLw062+UBbWX/EHEK2V4hzwSPQqj1dnbx7Gy1IuonDC4GuTeQBExIZLV8qij7KGFJBakItpUsG6upFDjX02SftVGoU/i2Wf38RQngEJfona7YWFhHMWA4X8ebmT5PTxEThp0VvcSRrSdUUr8kxOZndMLio5DFnaLJaBUHB8qgZCNZWNNcmhP3s4Xg= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR05MB2674; X-Microsoft-Exchange-Diagnostics: 1; BN3PR05MB2674; 25:HzN8boN5p4cIjVgNIci087oCNaRmdlFfT1nBxL16hBvwkh9G23Ac+oSWO0VCKQrcTpkVXro2f53o/ZzbMZhA6WnB17FhOXipBsyRF/X9FPDjk3tbG6bxG5/sP4WleGTrrASr1DnBJPyqmGIwkw6IkkNGi8SZs+pAFjOMk1QEBE1/8WpEzeuU4nj079lcmGA1q/di9YJsBX6Mh+fNj5PUS1NfCo5qiYRzm3b1itigCVaFS1+XsPZWJ+YoH2wvDJgBWvCNuYBYU7npA+Vl12iLjq8j3OXMC/3WgJ0w1UYynH7LPW23xT+tChfu4kx1JkknmDghzBcJU5Zwb7szqVnyJQMp1U4r+H8V+kD8RiYt7PfYIbnGxIMRslo/aFaKwwbr7TgncEugH/XYr7UCNYpfJ7sdrPJ24ZA05l6ImIBkhTkF/XI94M+9odArHYKeTk/W6V5o/QrTXEtcBW8z/oqmk8BCoqWnmsB7UgyeqUWhMukPGr9YFbcUHO1JRJLP1kpdASPipBBsNn6FMI6FgEMYXLv+jVOhgTdrg1jgM+ivBdPID0bDbXKbMoaF4SNFB9L7BDcxlPBO5lOTOglHa48eGCPzvK0xPhYjvA8y4Zk8d71nyorr7Xm46yaXSnRGno6hJUqMjoGqYOTInPHLekVTbUSB/hhFQFwkcdxlXRgmV0FgwMP4jgATn1apCtgBoXn+ X-Microsoft-Exchange-Diagnostics: 1; BN3PR05MB2674; 20:XAs+B+KndNUg99iJNM7Dn+nq/KU8c/WZW8GKsLsmcb9YPZEC8AEDNVTfvJLEn6U2TigV9lY5Rff8HOdJECSZYw5DRcAuad6dlXGu4aqwJ9ie+vPwRtcTLegajZD44S9iXCvspSLpLFje8m27BbC9O7W+BuneIB1FjCYvjGhb/OSdUQxKrCV1uvgvfzIs1YaMPoQGHnzB116iPr9Jtl8SAKn/xJl9HlPpnXd7mZRFCFhmhnjj5fZ7ZGJGbr30Mo0DlepahKeJsJhiPo0y5w2GRt0+gZMKsuilTEjtzVzWDGwsdzK0hGABEvnwNHFSs3SaaWieEza0Ggz2R8QKYAfckVcDucbgKXegrIPzeFUtFiXTC51mF4HEHZ0zRATofvBFImCCsnUeouVcgE1dD1ByZCgo5A4ZBak8z+1SgFf3ZQcQ08C8SxNtGopmJbY4R9EL3RwBUZyLUJvIrg21pfNe06weeotY4pCLJp1m+scueapmbI77UbfvgrT3QSDO3qp9 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13017025)(13023025)(13024025)(13015025)(8121501046)(5005006)(13018025)(10201501046)(3002001); SRVR:BN3PR05MB2674; BCL:0; PCL:0; RULEID:; SRVR:BN3PR05MB2674; X-Microsoft-Exchange-Diagnostics: 1; BN3PR05MB2674; 4:VZxOt4zP6K+c+04E9EnvsBCfIHWmVIAEoKTDP+qGcaQi6fMkRrSI9yMDmtcReHZnFMK7PZ0fgIUnmvOKzaY0WI60POjn79PcSMN5wIzdqljEDFS/OhYutFAHrdA8vAZolB9gbNsRj9QCbZ7nTBmsE17x5rhr2Vu5dqmZbXhLMDZKfHMHInTWy/arz+KdPL54EM9LVrB5d7zjPYY4JVHycdhtrAdoAl9ogS5lSfYPVGpfM16QqQYWNnOO4hz/qyGI7bjnYjlZg4TQsZftpmChdqMANqhGL9Q9BJPXaafkPSDvgq7ovxsLhOdSrMijupVClXneai1zwJBIJj+hCiP8Ns4ShWAyY5igoFVW3HIglzPPvT+kJLron0pcwJjejR5x12StZUD0T874q0AEb7VOZEdZF8zNaBX9iJvRRML9Cs3BCYrR/c63T/Vfgi/I6Y51fzkRiC9lrLRLGXjLqa9u1A== X-Forefront-PRVS: 08978A8F5C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR05MB2674; 23:OqyhL+AStJ42S0AVpF3NgLWCxBwfK1wLekY3zToW3?= =?us-ascii?Q?qLgUMsJ4EGTwZfU4eHCFiDO35q6Y3vc0TZz3FEIBVOR1Rr7+LVJyoQR/5oRi?= =?us-ascii?Q?adqh28ECx+gghOiIrylX3yl6JD7GyaVn6nEeCKEZhkHEhsPJDUXE2uGrVdBF?= =?us-ascii?Q?lNpAuRu/+Q/IyU6pewHCczMziKklzOgPb6rxPoLfLCbF4+GAy2iCcAiNEfhs?= =?us-ascii?Q?B/ah0wzj+TmrHFcAnRCX+BgUoYJ7OjFVZqvXlVUFiUjz7gHNaJ/neBdD3Pz+?= =?us-ascii?Q?2IrWKTWoFW1/i6JV5jHAZfap3zx5s01p95RovMU0jwhcIR8vHG28waIg7Xn1?= =?us-ascii?Q?QK0y9YNop8TP9n3ugMKKS7pVnq+s6SnVPvVux3xWQrGbxeC4GLqjJ98OjFNR?= =?us-ascii?Q?Qj06jkjF/sFrOhNsPizEm0778M8NfvS0dy7TYFeaFA7HIZVCwb99fPCSobcc?= =?us-ascii?Q?V9qmtOBDONruYW9lE+AQ/T+HjC1HtofNLxVwi+y/Xg27avF/LyBHdDZ81l9D?= =?us-ascii?Q?8bB+7acqPhbJoqpHhz8j2RJRUG2rM+4HARg34VyR5CC0SeMOpMXcar9vx/os?= =?us-ascii?Q?bMSKJtTvzHSaYiSkQ0nx/CT4E3X2wjah5pb8aT1J8IyE58VAbhNfbc9Ba/wd?= =?us-ascii?Q?b8PoZZDaX/0EXFypiIJOn62gbu921d/lJ2D6VeZquTsLrmHx12PJQDh9gfMN?= =?us-ascii?Q?SUc9Ddukgyc1aMKhBAdDpaq45krjljIi618tx3/ROd9G1TvvXDzbdbdUbpTc?= =?us-ascii?Q?zw+Q97UCuXxi4E97kk1uNlukaZOfdiiWTBExlefHnFUMY6t9ZfRipM+x9hNY?= =?us-ascii?Q?8M0Sxj9Pp0i4m2ePeStV4SU9uza2QsO/teWF2I69Nk/w9OPbJF8BTU4KvVSC?= =?us-ascii?Q?+a2/v9gGRRXx7xXOAIW1bFjzgVv8uKBJhmD5gn8dKAE0j5AxTqwm46rRH6Bm?= =?us-ascii?Q?ztRgWWvwCe2UEOXKVcO2LPWq5NvbXnkCH9XdZATF3Ck6x8V25FATmgcL3Tqy?= =?us-ascii?Q?zZSiQ4JM8OlN/cSfLvlC1hUx26OK++MoaGwLm1LNoIQA3DLW8PSZBoF6VRc3?= =?us-ascii?Q?P4I/FxzsEPx5piwj6jyIM/0X/UD?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR05MB2674; 5:nxri+cA6uIVOiCQIO6A7VeXnIujLXCuO9ySHsyPRznqV53+j1U8aGNhJ4GifLdNFl22d5K1OT9q5ooQ+k0jDETQF3MuXKzsNTFDA47yYhoKy6HgsOmJyirJthHahpLs9QycI+kAl1/ir5HE/6JSYKQ==; 24:oHlEe6FiiOLyC0bf5AratcNJrxr5C+2wfT+KY3oogLU/xcngbH1/L+Cz9+w/OtQ7JKORo1m3/SXqBfLEjCUl4prwFk8Rarb7TfwdNjPLlOs= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2016 03:59:11.4369 (UTC) X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4; Ip=[66.129.239.19]; Helo=[p-emfe01b-sac.jnpr.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR05MB2674 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.21 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: Wed, 30 Mar 2016 03:59:15 -0000 Bryan Drewery wrote: > There is still dirdeps cache code right further down below this that > only is skipped with NO_DIRDEPS. Ah yes. Index: dirdeps.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /volume/cvs/sjg/mk/dirdeps.mk,v retrieving revision 1.62 retrieving revision 1.63 diff -u -p -r1.62 -r1.63 --- dirdeps.mk 16 Mar 2016 00:11:53 -0000 1.62 +++ dirdeps.mk 30 Mar 2016 03:47:48 -0000 1.63 @@ -1,4 +1,4 @@ -# $Id: dirdeps.mk,v 1.62 2016/03/16 00:11:53 sjg Exp $ +# $Id: dirdeps.mk,v 1.63 2016/03/30 03:47:48 sjg Exp $ = # Copyright (c) 2010-2013, Juniper Networks, Inc. # All rights reserved. @@ -304,7 +304,13 @@ DEP_SKIP_DIR =3D ${SKIP_DIR} \ = NSkipDir =3D ${DEP_SKIP_DIR:${M_ListToSkip}} = -.if defined(NO_DIRDEPS) || defined(NODIRDEPS) || defined(WITHOUT_DIRDEPS) +.if defined(NODIRDEPS) || defined(WITHOUT_DIRDEPS) +NO_DIRDEPS =3D +.elif defined(WITHOUT_DIRDEPS_BELOW) +NO_DIRDEPS_BELOW =3D +.endif + +.if defined(NO_DIRDEPS) # confine ourselves to the original dir and below. DIRDEPS_FILTER +=3D M${_DEP_RELDIR}* .elif defined(NO_DIRDEPS_BELOW) @@ -370,7 +376,7 @@ MK_DIRDEPS_CACHE ?=3D no BUILD_DIRDEPS_CACHE ?=3D no BUILD_DIRDEPS ?=3D yes = -.if !defined(NO_DIRDEPS) +.if !defined(NO_DIRDEPS) && !defined(NO_DIRDEPS_BELOW) .if ${MK_DIRDEPS_CACHE} =3D=3D "yes" # this is where we will cache all our work DIRDEPS_CACHE?=3D ${_OBJDIR}/dirdeps.cache${.TARGETS:Nall:O:u:ts-:S,/,_,g= :S,^,.,:N.}