From owner-svn-src-all@freebsd.org Mon Mar 14 01:55:33 2016 Return-Path: Delivered-To: svn-src-all@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 63B50AD07E8; Mon, 14 Mar 2016 01:55:33 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0121.outbound.protection.outlook.com [207.46.100.121]) (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 8EA89F0E; Mon, 14 Mar 2016 01:55:32 +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=vpLXjNckiTsROIMsEUJ7mmiuHRXXJ75iedZDSyKJegQ=; b=PumvWOP7+Q5aNT2FD50Op+3ISPeR68dxyhr6dAMbYdDsUhQtrGD5oOwYxiVihoe88OfHfalPe/FNk8IUYgSExcADiyVKET19HIdNSSBR7eUulL89S61Cb4Vi1dQelDIoGbGBxOqWevlibF6sMPwerLjZ4CIqTu4qMCaPo1ysuIE= Received: from BLUPR05CA0042.namprd05.prod.outlook.com (10.141.20.12) by CO2PR05MB746.namprd05.prod.outlook.com (10.141.227.142) with Microsoft SMTP Server (TLS) id 15.1.415.20; Sun, 13 Mar 2016 22:21:15 +0000 Received: from BN1BFFO11FD023.protection.gbl (2a01:111:f400:7c10::1:123) by BLUPR05CA0042.outlook.office365.com (2a01:111:e400:855::12) with Microsoft SMTP Server (TLS) id 15.1.434.16 via Frontend Transport; Sun, 13 Mar 2016 22:21:14 +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 BN1BFFO11FD023.mail.protection.outlook.com (10.58.144.86) with Microsoft SMTP Server (TLS) id 15.1.434.11 via Frontend Transport; Sun, 13 Mar 2016 22:21:14 +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; Sun, 13 Mar 2016 15:21:04 -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 u2DML4D71687; Sun, 13 Mar 2016 15:21: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 4AE0E385508; Sun, 13 Mar 2016 15:21:04 -0700 (PDT) To: Bryan Drewery CC: , , , Subject: Re: svn commit: r296637 - in head: contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests share/mk usr.bin/bmake In-Reply-To: <56E33536.2000407@FreeBSD.org> References: <201603110135.u2B1Zd8a001604@repo.freebsd.org> <56E243ED.5050803@FreeBSD.org> <81518.1457728319@kaos.jnpr.net> <56E33536.2000407@FreeBSD.org> Comments: In-reply-to: Bryan Drewery message dated "Fri, 11 Mar 2016 13:14:30 -0800." 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: <14784.1457907664.1@kaos.jnpr.net> Date: Sun, 13 Mar 2016 15:21:04 -0700 Message-ID: <14785.1457907664@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)(199003)(24454002)(189002)(189998001)(110136002)(586003)(50466002)(2810700001)(107886002)(4001430100002)(23726003)(76506005)(2950100001)(92566002)(46406003)(4326007)(77096005)(2906002)(53416004)(11100500001)(1096002)(50226001)(106466001)(1220700001)(87936001)(5008740100001)(6806005)(450100001)(19580405001)(86362001)(5003600100002)(19580395003)(47776003)(50986999)(76176999)(105596002)(97756001)(81166005)(117636001)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:CO2PR05MB746; H:p-emfe01b-sac.jnpr.net; FPR:; SPF:SoftFail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD023; 1:voOMjEUKaS65x+gSYQtRGICUJj32XDIDm7nBoOGYStgdMYOnWHimOgJ8hnBrs1MMmqV5eAtzVL+EDsUPWZmyQDRmK1xy8gpzNd0aopGxY1lo2GokQm5vjqWzFSZKHSOsZ7aPvxQImOhdyGOuz3TPvvC13nkog4SUWa15ZqSGMQNYuuL0+tDcYWkmOPL1gpSx3zEmS3XP7qcHTEoKCCN3sepcVylGnr3rpmw53tlTyFRA7gS/4ICw2JUKPH4nOJJTdFczJ+tDsuXUCEnBF2xWnlLD99nRT487aRfoMAU98uPXLhkXX4IjENdLe+7gNmQ0HisaYBPsTVCg1pqR25eAdoAwqRmohn5mov0Ek4E7F8OxnPuKs9Wzn2WGdG3w1YceQtb033GRM/gKiI45dpo112c38ekXhyTwZdlxF4epuJA= X-Microsoft-Exchange-Diagnostics: 1; CO2PR05MB746; 2:MKZ/u9Qoct05EETmkfISqceLVMnfJpby3aI4GrdlGpfdM5mgPbYYcfM7r0Dve4VUBLYyhGiP4+1UrwdG8cU4f6F8ttLLBAFrT5yQ6r4hIX7vbOZG/VZBm8NOvwBQSIIXkBftIqs4+9xLK1bhSupvYQ==; 3:Rq3HA70sm8lgiGd8BO5eB+08si85tLHmeIFyvbVcXqs30umLfWBTc7CgepCbm1ADYWFMLk4tOzL/T28XJRZL/8OHBMUvOkYqRFchELIxNAB3XnCGIC9NFLofjATO6kTJzEIlM+DDj2cHVabdK9ZMLP6Y+7pOw4Gc44kiD+R5VNPNw22XS4SwcqwFuxfBcWBkozNb/h7WGnKcBMoIGOXz9Q7QeNot62/jddZATyNSowQ=; 25:8wmLM5thqlIS+/OghpxCWUIxIDdMWYoApPD8d22gY1jroGTi+kYBe7HYdZYiBwGqyd0tZbz6btiT2Qbunob3z5xqUmABiYByhREB7oJOG7uyXf0A8aHiTktBd0skMTrA5BQscTlo7/W78Pma7mPmasxw7Ww1fqjNjgT2TCghsYwMWzicicF3uTlX1xYJ3DSUr/jZwoKW/1A6E9kPjbmiHNzy6HMy3OGjaTUCeLwnN88pQhH64xBpvbJOpdDjbQte3mSgyIsGJN3iHEaP5ckMqVTHHibWlOG1xJ0r/i8QD1MdVzWKyIGO6g3vgtKNvmFTrU+1zpATtqDr+BRJNXtQAQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CO2PR05MB746; X-MS-Office365-Filtering-Correlation-Id: e80ab409-becd-49f0-0119-08d34b8dca3e X-Microsoft-Exchange-Diagnostics: 1; CO2PR05MB746; 20:piVjqROLG/fkR+L0kCWrd2ZnV6OCfnFmAneNWOF9fES7fdxd8pG5zisr2lQThsNIicgBpO2Duwg5o7IpnMZSawKMP/bjFUSC+lTEB5aRwqh3ionSFSuXrD2pef82QQjQPNc2NrH4oKY5/C8x3RaTuoWded2gE+rTCV3vlgSbIYo+1I0RyhzaOBhOprdyQEbZ40jE4oXJ2nUAPL/XI+kFYhANIHC0eydy0VgEsiy81Mzo7fCVXhasHvd/jll15EKSu99+uNvInIIi5aWZ1jsa9roQA9/2v2aCeYd60mKLVvFcmuao3hCGx2ZI5MQo0l/OoRMgU2bhrUqNlF3P+ckfsAIcW77zkYuq2qT+hStFPrqmOLZefRNCCQ4u3UlsCb+t0bnbgaN3EjU/og3xG59MFiEIn2SHVo3GGBcJE+F6gFesYgKfpA+J/rf5XEoQo9xpvzpwVlLPGR5WN9UHeDPqpiEZo3FlJXlQxOlHfa62jtxxLEcGTDliZ7F2l/4vovD8 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(13017025)(13015025)(13018025)(13023025)(13024025)(10201501046)(3002001); SRVR:CO2PR05MB746; BCL:0; PCL:0; RULEID:; SRVR:CO2PR05MB746; X-Microsoft-Exchange-Diagnostics: 1; CO2PR05MB746; 4:J2578Zy4TFvhtPFctf7iYvi/9Z+MTn36xZqtSHi5i+g1ep6TykrnGTph+xcbz17IYOSy0RDNUASbEkewM4HN9LW0GSigUzIDJzwtKnB/haPBYoPcJFQv/bqprlerC+DanQx41U/3WDjsnCt/0/v8XPSshyQkiyFA4F6FvwGr3YDnizy65s2oO3PEehW1BjctlgqKuMBM1J+wLey0x1xQaey3wzNoZV4T4skBL29ETKTEMMa7Q1qBJt4whfXhlTblOhqi0ChXLRSYS3y+1WHGnL4iUTnqyQ08bS8oxTENrQyHSDM07h0lLS7Jnm3zuUy24qg5gi3zId5twpm4UCF7rCdzVxesBXrOAV1eQw8yGX/ZzoAabgiHAu5+l8CHMN4JCq04Z8lZRiHbNRaaPNP7pWGoBqlug2P3X75XV/K1d1uYSZdbUOXLrLBghCdofuVCfMLD5mlGkDhaEf54YSEyJQ== X-Forefront-PRVS: 0880FB6EC1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR05MB746; 23:281zkxJqIlclb7Fa5vEJJQikhqYlH45ALFVgwTuAwy?= =?us-ascii?Q?nnBTt9W9i1OOI8GyqfekPzzliwDk+5yK1WxxDOMAwuM95XFLEiisCg5UUdDu?= =?us-ascii?Q?2RC4YZE2kWHbCdq544r+R2gyumOq6Xpv8XuOqd/Un8YVJIaLPeHXc67LxgLY?= =?us-ascii?Q?0fMG1CHH/pkVD3SV2u7fa1tOIA5l7Dl7uT5esxnAAbWQWGM6h/x/QTFfCH59?= =?us-ascii?Q?edm8RespIUB08umwLTP8LwDkiy128N7ckRs8HAFt2WtJWZCLU15D/qoyebH7?= =?us-ascii?Q?o4SMUzG2xzp6hq5RHY4y/ZhPuuQnsvRI8/gATSxGRCHZ0GKVEsCgkcwIdzxW?= =?us-ascii?Q?vsc4dknzAr3W/5CvuJInLbOxaIJGU4o1/s5Z/BUxtqIkDvGJUrw6kFz5bfy0?= =?us-ascii?Q?Ibgst4XW26JprhHtQHO76yKy/rBG3QttnihVF7rc8H/b2FQ0HxiUD8hk3CEV?= =?us-ascii?Q?bs6lycHK8F1HGVQYjcRYWmVR4Y9VG1lziykiatc0fHXtnVVhbHTcD1P3PcCb?= =?us-ascii?Q?XS7SzPzQIl/hR1eb5SwgtrPAXU/wCNDTomld5F12YGSQiuLY+nCXlNa+dlc+?= =?us-ascii?Q?pQ6p51My0T9+0orlRMWeghUTWAobFO9VBA7FD3z2OH+SexXoIaRBavf5BDCK?= =?us-ascii?Q?Opci/cBod6JbECK2+uNDEo1PD75M4zWpWEGnozfNX0uWwrfq3uzGnR8a7pnm?= =?us-ascii?Q?7blbE6vhmA/9ggTPzZvvC6K5mcCxUis6uFuIyM3MBonActgr5dkD+BfFZjMj?= =?us-ascii?Q?AWbQPyYz8XzgOTNYcxfenFrelOwRYj1qJQbSdJFVArDrVsa0reC4i/I+r5is?= =?us-ascii?Q?UySYt9comR0FeGc+WG1SowIcIv1D/DZdwisked32H1xjPWVv+BbZCVz8klmy?= =?us-ascii?Q?vwjZdymDt1nR8p89ul6TjlXu757tVQzSQghMQV+M9DJVmw8H9Y2KdznA/rL4?= =?us-ascii?Q?gpIxD1TT7HKg/hYiaUxgeH7LZGXO+t4mkyrNF0AcZrsz01wVgcy9eu6k9VuK?= =?us-ascii?Q?3gOl8bj+/EEyfH1ym6AClNcYMxDXKPq5od4Tm0mFciPtbqEsQaWTojjmvqe9?= =?us-ascii?Q?YXdoM67pzmKXnLeESmOZofZ4ChJHFItKLDuq3YSUx9xaNBBpu7ke5xER0Bog?= =?us-ascii?Q?JxC3pWMsQ=3D?= X-Microsoft-Exchange-Diagnostics: 1; CO2PR05MB746; 5:n3f+2Z0aEU3umVrlKPVBTDMcbYRtEqmpAVp/z68u9cJgIWclUigkX/d+/ynTFHdBYVZurc+eQk5VCo0/LF8rDaidUQ+wBWan33mOLk3+/PN78GPcsfIvpNYSOamvXci6DCiw66BcecWiwNwJBRa6yQ==; 24:q6T+VNofZl6Yw+/tgxHgNVQTDVcAlOU29UqX+2kn9KTQqbO52mKZxqOOHjrOLfvLyASozj0oX7CZCfwd0qfgQNiejh52nZ9pGKvhcMTR1uY= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2016 22:21:14.1472 (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: CO2PR05MB746 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.21 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: Mon, 14 Mar 2016 01:55:33 -0000 Bryan Drewery wrote: > Older bmake (with default MAKESYSPATH=.../share/mk) running 'make > upgrade_checks' in top-level which builds latest bmake in usr.bin/bmake > which uses share/mk/bsd.dep.mk where I check MAKE_VERSION for .dinclude > support. Since usr.bin/bmake/Makefile overrides MAKE_VERSION then the > check later in bsd.dep.mk fails because it thinks .dinclude is available > when it is not. Ah I see. Yes, we can rename the variable in the Makefile. > I renamed it to _MAKE_VERSION to avoid the problem in > usr.bin/bmake/Makefile.