From owner-svn-src-head@freebsd.org Tue Oct 6 21:17:12 2015 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 DB0059B65AB; Tue, 6 Oct 2015 21:17:11 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0133.outbound.protection.outlook.com [157.56.110.133]) (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 0CAC8A7F; Tue, 6 Oct 2015 21:17:10 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from BY2PR05CA062.namprd05.prod.outlook.com (10.141.250.52) by DM2PR0501MB1390.namprd05.prod.outlook.com (10.161.224.12) with Microsoft SMTP Server (TLS) id 15.1.286.20; Tue, 6 Oct 2015 21:17:08 +0000 Received: from BL2FFO11OLC007.protection.gbl (2a01:111:f400:7c09::170) by BY2PR05CA062.outlook.office365.com (2a01:111:e400:2c5f::52) with Microsoft SMTP Server (TLS) id 15.1.293.16 via Frontend Transport; Tue, 6 Oct 2015 21:17:07 +0000 Authentication-Results: spf=softfail (sender IP is 66.129.239.18) 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.18 as permitted sender) Received: from p-emfe01b-sac.jnpr.net (66.129.239.18) by BL2FFO11OLC007.mail.protection.outlook.com (10.173.160.142) with Microsoft SMTP Server (TLS) id 15.1.286.14 via Frontend Transport; Tue, 6 Oct 2015 21:17:06 +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, 6 Oct 2015 14:17:05 -0700 Received: from chaos.jnpr.net (chaos.jnpr.net [172.21.16.28]) by magenta.juniper.net (8.11.3/8.11.3) with ESMTP id t96LH4D13568; Tue, 6 Oct 2015 14:17:04 -0700 (PDT) (envelope-from sjg@juniper.net) Received: from chaos (localhost [IPv6:::1]) by chaos.jnpr.net (Postfix) with ESMTP id EB921580A9; Tue, 6 Oct 2015 14:17:03 -0700 (PDT) To: Bryan Drewery CC: Warner Losh , , , , Subject: Re: svn commit: r288911 - head/share/mk In-Reply-To: <5614286D.7020904@FreeBSD.org> References: <201510060418.t964Innu071170@repo.freebsd.org> <56140CAD.8080200@FreeBSD.org> <15356.1444161040@chaos> <5614286D.7020904@FreeBSD.org> Comments: In-reply-to: Bryan Drewery message dated "Tue, 06 Oct 2015 13:00:45 -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: <19413.1444166223.1@chaos> Date: Tue, 6 Oct 2015 14:17:03 -0700 Message-ID: <18968.1444166223@chaos> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC007; 1:2A2xXnDC4bnX80h4CCfbJLJuLEfGntI23Z7c6/LxhrPmxfmP65tow5lgRu90NFKIvBybLAzc4EJrYLqjkqaIYOL6LmDWag4zGgfcPFv5amqzwZo5EU1Kbw8VIOX1/2vo/23UxoBp3w83KP4AYB1cDmMVcAYtLIefNwKKTT7h1ezVzrsE4veJ6VLw9Ezs7HkHe0IYhRlph5nEwCCA0hHrw/6RlRCPl13pqqOjbxPRCVtoCoh380YKP+NN25BMC1PYZfsXu9W+hVkhAg9nFzzCUYHsNKuhLuRtnjzSMD0y3rEJ+gMoc6DIZBewjrYRyvhtgvGIaeqz/n3sLFX6V+dpsQ== X-Forefront-Antispam-Report: CIP:66.129.239.18; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(199003)(189002)(24454002)(93886004)(117636001)(19580395003)(23726002)(64706001)(86362001)(97756001)(5008740100001)(19580405001)(47776003)(50466002)(33716001)(105596002)(106466001)(50986999)(46406003)(6806005)(76176999)(189998001)(46102003)(76506005)(50226001)(5007970100001)(5001960100002)(69596002)(92566002)(110136002)(2950100001)(87936001)(97736004)(81156007)(57986006)(107886002)(5001920100001)(77096005)(450100001)(62816006)(42262002)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR0501MB1390; H:p-emfe01b-sac.jnpr.net; FPR:; SPF:SoftFail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0501MB1390; 2:eDnEPTp/jxL19uH1FWcuUdR9ldjHDhiHdAP4g8+qQvC7V41Gzq/sGGLvz4N3bcl6d4eNWaoBveAzGja2BkPXR8bDKK3ZWhfdWHtPNf/ykf+USnKfbG3wI5RRMZpWLunCQ2s1rfT8SUeFHlw88RJJv7NMGV7l2T3G5KH3/gp5R1Y=; 3:D849F/9TFDEdJeNgvpRIn/mFVNXax8q66ESvId+x7QffI76calUSJL4IUWqKsBNH8ZdvgQD3Hx5VjlMp7Cm4iklao6CtChyBhsUPg8ymYb4K/tf+CUzU51PcKk/UQ3nLRhcBg0i0+P2mN8PJ6Jz0F+RGW8wpgPr0krKceTUu7y5zQM2wVNwd8NuY3zaYu/ZwTYmss/tgJhWOIzyPXbBe1HipUYNllMwRd08Uu1q4k1w=; 25:mdvmDPQSOuEXHmdko5/t1pRulkKTq7jc+/s+7/UHqr7XggzxyrfGlN5inbolGDoXjXYWJ3dho1GEufdXmofdXjjSPimJOMhntILE8b5sH/E5m9pISXYdLtYgUk68DpghJFL85vqLs+AdT54FLbsbXcoGwSdlBIHsr18BhXt9JYj0ovjeNiaur7jO/zx8/wRJsnC2dRKunhsrA6QcgRuBCgs/QG7xzBaZdPsIt6lHEk5C3LF1q04y7GIbM/uXmlks X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0501MB1390; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0501MB1390; 20:uoWQae/0/NWPmivD5KgrjKPatLPgG4Rb0Cqn/CLC4QYz4UE+QGY27gDbQDq6ofA0OZv45kAKUa/PRtJiHwV5YNc/2lBbwmoxWv7prlgRmJ3yKWEV/zpoeBgqLbB4AjtdmbQWaGRwx1QCXwXEQVMRDSuD6GvPio09Noqql6/iVQge34YbniR6DAC7o74jR0bb+xzUvn2hX62cyXUDtUyR9nobjQwmw9KDqmbcVCBkYzk6f6zq6alXD3nAAPIB0HyJ0HMEJkR+EfBcyK+VKMIzCO34ntDYctloYji3IoqCJSlBgoU20btBTP1uuiylZs6Y89bV6mTMCG09zDUcYQlCXjizyj790w4Rl68iHFgSqHFZQr70ZmBKM/NeXCumbkqT8NGzUSU92tAgkVdpLG4R2tSIj8/DSGkQ7ZrcuVuUzfLMDhZWZ0XXsPA98BN5lrlP7lYojRT+8mlSZ49uedCK6Ndb8HVRIZy5y5qcX1TcMlw6cECFSSSirOOqUIvxpT4z; 4:glXYivzADGBAcHBq3k/O/eaCzReiBWCZ4UhGtdWRwmFCjfaJh0QXvkQNF6C6QDi7wPkwCk7l+kk6TEhXc7TDImyqfsysI2cyQa2OjRf9+Cqj7i4qM5s+XnKCxzQsSe8upjQhe2Amd2pb0Z3xlbhhxnZZuE969+ZtNOEyfVf4cGZvKdxe7F0f0FEu5p1WYf023y3YVePbdXU70v0vnFi6jdSp/e94u7pwtbG/nSeN3Lsj5/dTUQcs9t7tAwO2/hOJ5P57phqT6G6OL+HoLtIUfmgzYlAdNoTYKdWJp9EYlCAcCKRlzYptvnJaTyH4NSunZJ+j6DGN8Qhn0NEZZoU0TRFvpPFBTPPJI6ojgF5tVo0= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(520078)(5005006)(3002001); SRVR:DM2PR0501MB1390; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0501MB1390; X-Forefront-PRVS: 07215D0470 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0501MB1390; 23:wm070ok2mynh0C1XXXmEhWpV3Q+fEL/LJXTIVea?= =?us-ascii?Q?ydlb/qOojeOgAQ7jU3tp0jActM2dlg+rRsIcbe2RMv6SewOJgOMr8+IgUBxb?= =?us-ascii?Q?JJm3D+6tSLrMiXBwZRmCzULefrXEU3ZXuWEsRKKPIIiZqmqdpMwWPuD8D4mc?= =?us-ascii?Q?efy5lJ722W5BVYOVg+jd2oxXTQqXOcj6cM8C/JjfD5d5q4Hoia11RgBQtS82?= =?us-ascii?Q?GcPcOef22TwPDz6D9L/r8iWpVWUM3C7QRge6d+6LuzIrJ50gYaGexqQ/xoPl?= =?us-ascii?Q?ZDnaUFiRtrI25ZlpVLmHO+Hy+uYUiPALJLpw+S5gTVu1tPEJU+D9U5O0HjzN?= =?us-ascii?Q?xuZHvJpNheAdh2DUpDCvgYrcEuINuyMFIGngs4iMZ1NJtkvGUcrVKy4f6psq?= =?us-ascii?Q?5+rTXiQVzya4/GWuGAk2w4VjwbNoRDDQrRwEWwY9lx7+KlBY1wjW7VP0Go5b?= =?us-ascii?Q?9w4aDR0D3CkY7o7GSfzkXQCyro2+xq55D8wzBE7lH0P6NQZ9f+qfSksZkTT7?= =?us-ascii?Q?b6STe6ShWPQRCKltbYeaJUFZ3q5bNSuAm8VAqUP0aQwXZJdf0yvXONFoVZl8?= =?us-ascii?Q?WARoNCJ9fgzReic1Z0mvWKbPUrbPVlkXLzTkGEPXrAiuQABe8zkDZZbE5Kkt?= =?us-ascii?Q?sN6tTdWbk4u5asq+rBvir6QUiPYkiSBQM+VSUvX5NU4OKZiJWiisd9lwGPGV?= =?us-ascii?Q?uDDiORc+XAAvz/YrrjHpEe4wtUTMI+Q1hlJR2ZZxGDZJT/i2DDxv5MM6DvIS?= =?us-ascii?Q?9i+c/CMWi4TSxi0eTSktoAcMGWXQy8Fgy3Lx2DaJC0cAHhF6WCXNsVGQhurq?= =?us-ascii?Q?hGUTZV70icL6TLEbl9zi8vfifstRR3Yurzz8+vyh0TO/mdo4eYY0jLlBpUR0?= =?us-ascii?Q?DCD2CGlKRmB/LaXUjGp6Q77iJsFfHkaSh/JoOebdJ6JHT+Xec8AmClGRoEDU?= =?us-ascii?Q?Nj+NPL7DA0QQKAFhZGGsAArWhR6BzRCHkUJP1takdvMe4Q7A/+5kFpEvxg1T?= =?us-ascii?Q?VPR7XZlaHJ8v4KaqAE4xMFyjNhh8zAggCraCbxZzEJBIBcSsnM5uDtdNpnsQ?= =?us-ascii?Q?cfOudwFEp5h4Adq/dAaAOqG2+lJeZgqq4L8VU30e03gqZ20CoaqfeEKmH7AH?= =?us-ascii?Q?mgrwyEAqhocrgwyg275BkU6RigpGySpfbr2r0MKRny3aMdc9daIQNhauUqwG?= =?us-ascii?Q?MlxiBDD9odjg5u6o=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0501MB1390; 5:QWmLjdVKsi9+ji0/x0xsc8JG0iiWvRcSdf8hGlDe0sjTS3Mwfbr5xm+A4dYc+5lhv16SYkrDynO3qRSzUCSTDXIlf13sJKbbZ5JMsuaZ0+1P9EFISYuLVTnAYNTSQ1qH/fOYj+IKqU1rQLrwassRmA==; 24:Q89vUsIHrvMWLL2lUkNJsnJgLU8cwqe5NIjgqvnZJCdG4whpYHXkqwJhgT+PaGomOI6aM8Y7HXqTMs5p3K2rt0tb8vzvrYSjmy3PPqyWWRU=; 20:8Ak/ytue7H0DzjHP+yj9kElH6MxvHqA932G63GjjvG9uizCUmnfywSLaPUcWlifdw0HsIFVrkBErkbrgGz9E6Q== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2015 21:17:06.8070 (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.18]; Helo=[p-emfe01b-sac.jnpr.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0501MB1390 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Tue, 06 Oct 2015 21:17:12 -0000 Bryan Drewery wrote: > > But wouldn't that imply that /usr/src/share/mk is the right set of > > makefiles to use for /usr/src/ports/ > > > > What would you consider the right sys.mk etc would be in such a case? > > > > For our case we want the checked in src/share/mk to be used rather than Are you refering to a src/share/mk which is sibling to src/ports/* or something else? Because with MAKESYSPATH=.../share/mk src/share/mk/sys.mk is what you should find. > the older /usr/share/mk as it is easier to support. If there's a problem > we fix in our local.sys.env.mk or bsd.port.mk for instance, it will be > used by updating the checkout. This was something we backported, > without the src.conf inclusion in sys.mk, and were running with fine. I might be confused... It might help to differentiate the question of finding the right sys.mk which IMO is critical to a happy outcome, from what to do with src.* if present. Normally anything under $SRCTOP should be subject to src.* - by definition. But there's no reason you cannot make exceptions - by (as I think you already mentioned) adding a check for $SRCTOP/ports in local*sys*mk to suppress src.conf at least.