From owner-svn-src-all@freebsd.org Fri Sep 11 15:24:22 2015 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 C1D80A029C1; Fri, 11 Sep 2015 15:24:22 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bon0135.outbound.protection.outlook.com [157.56.111.135]) (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 85D0D1232; Fri, 11 Sep 2015 15:24:20 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from BLUPR05MB769.namprd05.prod.outlook.com (10.141.209.19) by BLUPR05MB087.namprd05.prod.outlook.com (10.255.214.18) with Microsoft SMTP Server (TLS) id 15.1.256.15; Fri, 11 Sep 2015 15:24:14 +0000 Received: from BY1PR0501CA0019.namprd05.prod.outlook.com (10.162.139.29) by BLUPR05MB769.namprd05.prod.outlook.com (10.141.209.19) with Microsoft SMTP Server (TLS) id 15.1.262.15; Fri, 11 Sep 2015 15:24:13 +0000 Received: from BL2FFO11FD049.protection.gbl (2a01:111:f400:7c09::104) by BY1PR0501CA0019.outlook.office365.com (2a01:111:e400:4821::29) with Microsoft SMTP Server (TLS) id 15.1.268.17 via Frontend Transport; Fri, 11 Sep 2015 15:24:12 +0000 Authentication-Results: spf=softfail (sender IP is 66.129.239.17) smtp.mailfrom=juniper.net; freebsd.org; dkim=none (message not signed) header.d=none;freebsd.org; dmarc=none action=none header.from=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.17 as permitted sender) Received: from p-emfe01a-sac.jnpr.net (66.129.239.17) by BL2FFO11FD049.mail.protection.outlook.com (10.173.161.211) with Microsoft SMTP Server (TLS) id 15.1.262.18 via Frontend Transport; Fri, 11 Sep 2015 15:24:12 +0000 Received: from magenta.juniper.net (172.17.27.123) by p-emfe01a-sac.jnpr.net (172.24.192.21) with Microsoft SMTP Server (TLS) id 14.3.123.3; Fri, 11 Sep 2015 08:24:10 -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 t8BFOAD98271; Fri, 11 Sep 2015 08:24:10 -0700 (PDT) (envelope-from sjg@juniper.net) Received: from chaos (localhost [IPv6:::1]) by chaos.jnpr.net (Postfix) with ESMTP id DA400580A9; Fri, 11 Sep 2015 08:24:09 -0700 (PDT) To: Julian Elischer CC: , , , Subject: Re: svn commit: r287636 - head/share/mk In-Reply-To: <55F2529E.5080105@freebsd.org> References: <201509110019.t8B0JocS082576@repo.freebsd.org> <55F2529E.5080105@freebsd.org> Comments: In-reply-to: Julian Elischer message dated "Fri, 11 Sep 2015 12:03:42 +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: <12313.1441985049.1@chaos> Content-Transfer-Encoding: quoted-printable Date: Fri, 11 Sep 2015 08:24:09 -0700 Message-ID: <13099.1441985049@chaos> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD049; 1:qp9swUb7q3curf9U67tn6AtPhfjPYeHCiKpSu2Mb/0Qa6+UqcuC8/P8sa5og9ZvMtGfLJtdiey+1alZ8ML49ZJ71PHe16EZFEkv7Ue/+h/l/pPIjWZb0MU8DKFvroFK87luj9iCV54dcFRoJCMuChblTym5uUSg+C8WkCoz1HTiVw+FZTyqYYPPG7L5zdi7T5EyFjKxwVXO3yKNp2TEqGxbFAv9YjK0qWTqDl1lOu4gRzhnGfLW6Ychcd/PKYzJ2LoBakwLBO7V3CgiimaUnNacoYc+S2YpwzNN+N/oW+MU2/wbffQt1S6eG98ptf08V8D9TSA3r674WQg2djLGjUg== X-Forefront-Antispam-Report: CIP:66.129.239.17; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(199003)(189002)(24454002)(19580395003)(81156007)(97756001)(64706001)(57986006)(50986999)(47776003)(6806004)(19580405001)(5007970100001)(68736005)(97736004)(23726002)(46406003)(77156002)(77096005)(106466001)(76506005)(105596002)(4001540100001)(62966003)(69596002)(450100001)(76176999)(50226001)(92566002)(5001960100002)(110136002)(11100500001)(2950100001)(189998001)(107886002)(86362001)(5001920100001)(87936001)(33716001)(5001860100001)(50466002)(46102003)(5001830100001)(117636001)(4001430100001)(62816006)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:BLUPR05MB769; H:p-emfe01a-sac.jnpr.net; FPR:; SPF:SoftFail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB769; 2:6QICEVLAcqngeoS74vEJHLciHGCXol9cZ4fU4YhJnXE4b6jFljuDPX8siCF9XXX6RkWIGw+QbHOtqcep9z/Cry6ysKcXuTPWB+w+e2WAcXIUqhGTH5h+p0PcWDn8Ioqtr1r4zhDXsf2yu63E8ZnU0b6zpu/0We7KeP3UoILIIGU=; 3:5hQ0pQDnn3VqqqDNY7iH7dEGshWj2d9bPxf7QqnUQm0syurOa1B3me8GKfwUkP6iKqV/t3I2Do7CFNSeydfkR9pm7mzQiy/+9uEox80oFfsXSO78TCOmvDPSEghl+XJPU9kWugv5dQrvlYN9zanohLco43pG5fgK6YjaREUjJSYNhfriTpMyloInMVmC4Icx48q4bcX4vXdOq5cJUG8C3lSi9Sg7IQTzt4s423WMwjw=; 25:Chl2dfxZJHHU5BjmIaGeu4tpprnYmJM+SVy2NZwsvPO8J752ZtrqbFUfJdirxkRDFMMHB6lcfbYEHEMDN8RGzhTXGIdGW3T4sg7apKI0RD8zR7QMaMaYjCH7tZhhgIwsMSssWphKO+oHrzlyMAL1t6nz3THEkhezTEJJyAFTOdq1IITh1hfj8ulm1pZXbT+20aWX1r9FJ3fYG/jTtwaIgkeN0l47WPo378wCyS/ULI+nXkiXn1fHjjusM3cfuHN7IdHWFVwKGUinAmvDN8NIBA== X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BLUPR05MB769; UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BLUPR05MB087; X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB769; 20:m5A5iSWndOcduumWseKZK4ATwPhHDNcDQnKl9vt07my12J5Z/51lu1zNt7c/hg6ne+dF2PqoHGY7ZaqZkWocwq00DNjnheY/S/3cb1KrOBilYOrY43LbDtJLbI2JsYnmFNqx1/5/QmKm4NGWOaxFqqYNNbz9MYDXG3A6QtLtWHUCLnaEYKLCWZjAJ/YqiuxOTBr2P7XRb31F+Ly3GidsNwaCpRmsL+LAOOnvbuCzk2fSHLAcoRTIC9Ffxg3Z2P9fkO5a6HsFRtfxCYZJiTazXw8qc/CY/pcXyFkE8E/HiwuW2iG2ur+IEeMFSm1yNpNjDLRttGqaXBm0VtaDfNB5+sjz74sLBs2lqpg0B98sa6XJTWpNN1KFjnhWYVn4aMCoRPvqs5s8OEmkr5Otc59JNAxHPtIXpqe4W2XAccM6uIhYvrmhIxg4u6KEko1W1NbAXQ2ft1GmsUgAzfKjBsNVogKxUenc3k/1lygvN+01Y9FVoQ/7Ldd0wgLyL+4dZHq4; 4:2tRpU1Xa1AaBcsuGBYGaJ8qQ0UHDOnBA982dgi9pKvIs+WSHz4agb+m5hh6WjZ63OIog4F7xl6Vcy3im8CBeD9k65M6uqE0SBcX91FpdS0rj/guPiCbnUO6Gd5aYrKEICk4E60sd04eKLqFNUzeNMUMEmYao3nE/KYE+pTxoXY1XynJXz1AhlKNpv8Z5DzSa563IuUo69RNwxJKuBVpXQo5ZWT3l5qjNi87K99Nik4kl7k31yISpd7ty+CueH10WlTzDHTIv43YmnH0cOpn+RC4Igfe91wBT09hkmbSQBQFyORok+uoNsQraYzi+S8FW X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(8121501046)(3002001); SRVR:BLUPR05MB769; BCL:0; PCL:0; RULEID:; SRVR:BLUPR05MB769; X-Forefront-PRVS: 06968FD8C4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR05MB769; 23:WthKQEH4Kuh3LSJ6AmrbzEjQiGQluhask9GV6YgKHE?= =?us-ascii?Q?/BKVsezFSoIGmvN10va31Y+dAZhA+TIaq9v63XPtc7LFb46KuieJVC18Bz+2?= =?us-ascii?Q?xT/LEpfzyBK3Meq1QP++Nq53N7H4SCvsktwQaFAyq5JvCU6yCgYi35WMOcnL?= =?us-ascii?Q?fA/NQZWDgIAVySPa8ObTyTBjR9YzOy8jGYhyNttbEx5l+9QTNBrJQcyCrZTw?= =?us-ascii?Q?4CsrK/NciLm45lfnImYvWp6sBno4mFmDu8vJ6j/TG0WMDOtRSMGUYJIj9kIH?= =?us-ascii?Q?YuPn01lMDHhYDkmpACMGVWf9q0A0AP9RYpYRIEg+rr2CYg1ib7jVIdzo6EvL?= =?us-ascii?Q?RKJcKmAbeuNsPBq1eNVBdmOFlsSt8ZoYsywXYsyBea3Prdw66Tq1Vh4lf/yf?= =?us-ascii?Q?1GM7q/YwmYzR8ikPtiprXRuxDd9ewoCoIic+4Argg+Vn+2J0tKm746dQaOel?= =?us-ascii?Q?el5+9KhPKn9+3VEw8HkWf6Jzj/A5pnm+uY/yTjGmCfdnfqrO7IkDXNsLyvzA?= =?us-ascii?Q?77R3CJ2zdmQvFq7Uwam5TjcuhTAKIYx6QgOnEXSm/70FTPrjNLaX3SLZPLEj?= =?us-ascii?Q?ARNIRRpK4Yz/Wp4Kif1kqGhJPbL6FSSELp9/PRDYcEde3FG0bBmBby42YtEs?= =?us-ascii?Q?eyi04CycbsxlSRGJSJTV2JUHrL78HaDjBn7Zj953g4miVUw/iBzLmcpMHs7Q?= =?us-ascii?Q?eI1YTRcaycjkWFW5Z5uVyLn2WNjKpNtWrpPbeu+BZNPvzT+7douoL2XALb6q?= =?us-ascii?Q?Cg6eCgXzLSY7/a+INXKLAKWv5DY21v+tVUeSocZ6ADkJRK5Re//pYfEO40Y8?= =?us-ascii?Q?GdyMpVcIA1hAmtE7hhRpOGy3gWCiOMI+auYrRlkkH5lQt+AKmFMgtN9OrB8n?= =?us-ascii?Q?5YHVxj9tw2C/Qu8eti1U3S6kv7b2WkOsPBPq1dggm4y6GNrUqZD3WJQ/Mwzw?= =?us-ascii?Q?eZLIt24xzX72jRskZl7moR25duD4Rd7cXgEkA7dVUV7KYjdmHe8McngRCWlQ?= =?us-ascii?Q?dduro4tPnBlBaB29Te7r9HVqmYipBvU2csf1VjsmmWgiPG6VUGinT7TPjmW+?= =?us-ascii?Q?s5+shmluiTapQtTeZ2jviyQzDEP+3PIn+uetxOwIn4MX5NISY9e97ClhxnYc?= =?us-ascii?Q?8PTofmmkY69XKhXG6wyyjx864qIcTsXxVq+V6EvER6iHCnqhbHGmO4W1GusX?= =?us-ascii?Q?U8fBL8gJJJbbrccUbWjWpU9gT6RnPqpRhMjTofUnr41hKeO2rhY+8Ldd2qPd?= =?us-ascii?Q?Y3/qORb3f1i1dDLOnPUovO+WFq5Sply5R9kMeykiCbM2flxtqKpzVpQXOUwu?= =?us-ascii?Q?tMk1CXIC0fS8t8O8gwq80=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB769; 5:t+jS4VZoiPz67r283eI4RsYhjPGzFyNabwJtz7JY/vwpkkpn8JcDLDsEuVBVjgYEe2tBGfNcB9X/5HrE/dh6j9hFrzwiHoihyI9Pya+Cwlw36F7GVSCX/kDli/s7mDM4oj4LOPLvwJwLahMnK+VyqA==; 24:t7qjIhoAsPg0jBrIluaY3BYmTgYRmfT7OLHk0rQDgneUTCLaXkTkaz8QsfhRq//K2K/6eLkSoltO8xn2ECRbLjmH4haUKlCRTlcL7UsNEtA=; 20:lRxxotnMMBr6M39XsaqShek522MzNWudpbDVTuatqHbQRl9G45HOSY8weM8kZF39/qSJwU2jIcyCmkwostQq2w== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2015 15:24:12.4913 (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.17]; Helo=[p-emfe01a-sac.jnpr.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR05MB769 X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB087; 2:n72wZ1Ng9sMVxn8yGb+YZXXDI4+IeIggVyBbemL5gobMNQzPzwgDTPRb2Fkd5YGAOAR8Dei6GkiYd0SIt1n96A+Kwg7VQ+M5WC+WhE5G1RwbOwrycXlntn5a1qYtNbcxMGjoT3HpsUCnaXthzMW74DQex8V2vlVhHk/LQdl6qYk=; 3:gcTW8nFjuDhOEgZbfVY3OuO43hX/JV7ESA5PG5fbZ2K2KjoWt9BH4oVEXA0pADfnJCMCEGbmW8judKO02g4uZxn5kjiJpVw3kG0iSrNx7dgDyWlxmeqq4b/5fMxvu2St+L/1wq9ZiGWAiD0pbX6tyL3nAEyFCV6dvWDhlpE2JqLovcLHGRzrX99p8QspOsHyE/fcrN5/QQQLEvGyyiibCUr/FgXxTcX7odKltmC7crc=; 25:zJ+l/du5pAm4bOUjSEkIZ2XJ6TIPqAEVRGMQorKYTQPvRpoHhttZ5hmnA1zFOgc+eY0ESm3XGBefEuUfe94p3yG6U2pTl7g2Q6VMxGUQq9d5Acy0FFT0qMRKBH9zl13o4W2BjAOv6iyJODe2NnxDhqSI7AbbVRzNG1uVDuW8yjJl339zBHlHwreOkTD3Q//9wD/8QAbgy33BG4qIfvzWCqgyMy7zQSUBlIO4PR/82oiG+RC2zI8wHpBQz7U5osNqzLmY7G2BwPQx9TCVR6WhaQ==; 23:XzHW0uCNxH+e9u2ixUN5ScuCmpL5yi1OP7F8Mc/H4uqqqMM3IHXOaiQasFKe7BQy57syjwSDySuBkW2oKgYPIzsjPljOzP4jvi/1JLhjYyrfm+Q6lLDDHDu6XT8v7eNMV3rv1gcIseVoM1DXez0hH9orOKsinq2/2gSSnjuMsfOTM2yOFibzmB4Tfnd957DG X-OriginatorOrg: juniper.net X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 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, 11 Sep 2015 15:24:22 -0000 Julian Elischer wrote: > > If MAKEOBJDIR is empty or not a suitable value (no '/') > > set a default that works. > = > if not suitable.. it should error (with a really explicit error > message), not do something else.. How about: $ MAKEOBJDIR=3D'obj.${MACHINE}' make -C bin/cat -DWITH_META_MODE -V .OBJDI= R make: "/b/sjg/work/FreeBSD/current/src/share/mk/local.meta.sys.mk" line 29: Cannot use MAKEOBJDIR=3Dobj.amd64 Unset MAKEOBJDIR to get default: MAKEOBJDIR=3D'${.CURDIR:S,${SRCTOP},${OB= JTOP},}' $ Index: share/mk/local.meta.sys.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 --- share/mk/local.meta.sys.mk (revision 287636) +++ share/mk/local.meta.sys.mk (working copy) @@ -16,15 +16,19 @@ MAKEOBJDIRPREFIX=3D .export MAKEOBJDIRPREFIX .endif -.if empty(MAKEOBJDIR) || ${MAKEOBJDIR:M*/*} =3D=3D "" +_default_makeobjdir=3D$${.CURDIR:S,$${SRCTOP},$${OBJTOP},} +.if empty(MAKEOBJDIR) # OBJTOP set below -MAKEOBJDIR=3D$${.CURDIR:S,$${SRCTOP},$${OBJTOP},} +MAKEOBJDIR=3D${_default_makeobjdir} # export but do not track .export-env MAKEOBJDIR # now for our own use MAKEOBJDIR=3D ${.CURDIR:S,${SRCTOP},${OBJTOP},} .endif +.if ${MAKEOBJDIR:M*/*} =3D=3D "" +.error Cannot use MAKEOBJDIR=3D${MAKEOBJDIR}${.newline}Unset MAKEOBJDIR t= o get default: MAKEOBJDIR=3D'${_default_makeobjdir}' .endif +.endif .if !empty(SB) SB_OBJROOT ?=3D ${SB}/obj/ # this is what we use below