From owner-svn-src-all@freebsd.org Sun Mar 13 19:43:51 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 11188ACF306; Sun, 13 Mar 2016 19:43:51 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id E9112A7C; Sun, 13 Mar 2016 19:43:50 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id DD6BE124C; Sun, 13 Mar 2016 19:43:50 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 9778819CED; Sun, 13 Mar 2016 19:43:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id 3zA50R_ZhETs; Sun, 13 Mar 2016 19:43:47 +0000 (UTC) Subject: Re: svn commit: r296637 - in head: contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests share/mk usr.bin/bmake DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 6D28019CE4 To: "Simon J. Gerraty" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201603110135.u2B1Zd8a001604@repo.freebsd.org> From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: <56E5C2EB.1070206@FreeBSD.org> Date: Sun, 13 Mar 2016 12:43:39 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <201603110135.u2B1Zd8a001604@repo.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Pl3n94xGq40cdCKAnSnnfM6wPHTae6TTl" 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: Sun, 13 Mar 2016 19:43:51 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --Pl3n94xGq40cdCKAnSnnfM6wPHTae6TTl Content-Type: multipart/mixed; boundary="FsLaGPx9brUtgQhA83Ko1uKK85jHXtJDD" From: Bryan Drewery To: "Simon J. Gerraty" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <56E5C2EB.1070206@FreeBSD.org> Subject: Re: svn commit: r296637 - in head: contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests share/mk usr.bin/bmake References: <201603110135.u2B1Zd8a001604@repo.freebsd.org> In-Reply-To: <201603110135.u2B1Zd8a001604@repo.freebsd.org> --FsLaGPx9brUtgQhA83Ko1uKK85jHXtJDD Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 3/10/2016 5:35 PM, Simon J. Gerraty wrote: > Author: sjg > Date: Fri Mar 11 01:35:39 2016 > New Revision: 296637 > URL: https://svnweb.freebsd.org/changeset/base/296637 >=20 > Log: > Merge bmake-20160307 >=20 > Modified: =2E.. > head/share/mk/sys.dependfile.mk > index d12d939..745873f 100644 > --- a/share/mk/sys.dependfile.mk > +++ b/share/mk/sys.dependfile.mk > @@ -1,5 +1,5 @@ > # $FreeBSD$ > -# $Id: sys.dependfile.mk,v 1.6 2014/08/02 18:02:06 sjg Exp $ > +# $Id: sys.dependfile.mk,v 1.7 2016/02/20 01:57:39 sjg Exp $ > # > # @(#) Copyright (c) 2012, Simon J. Gerraty > # > @@ -49,8 +49,10 @@ _e :=3D ${.MAKE.DEPENDFILE_PREFERENCE:@m@${exists($m= ):?$m:}@} > # MACHINE specific depend files are supported, but *not* default. > # If any already exist, we should follow suit. > _aml =3D ${ALL_MACHINE_LIST:Uarm amd64 i386 powerpc:N${MACHINE}} ${MAC= HINE} > -# MACHINE must be the last entry in _aml ;-) > +# make sure we restore MACHINE > +_m :=3D ${MACHINE} > _e :=3D ${_aml:@MACHINE@${.MAKE.DEPENDFILE_PREFERENCE:@m@${exists($m):= ?$m:}@}@} > +MACHINE :=3D ${_m} > .if !empty(_e) > .MAKE.DEPENDFILE ?=3D ${.MAKE.DEPENDFILE_PREFERENCE:M*${MACHINE}:[1]} > .endif What changed in bmake to require this? Now in older checkouts I don't get MACHINE defined with DIRDEPS_BUILD without this change. That's not ideal since it breaks older builds. It seems the old version had @MACHINE in its own scope but now is in glob= al. > ~/git/freebsd # WITH_DIRDEPS_BUILD=3Dyes make -V MACHINE > make: "/root/git/freebsd/share/mk/local.meta.sys.mk" line 213: Malforme= d conditional (${MACHINE} =3D=3D "host") > make: "/root/git/freebsd/share/mk/local.meta.sys.mk" line 249: Malforme= d conditional (${MACHINE} =3D=3D "host") > make: "/root/git/freebsd/share/mk/local.meta.sys.mk" line 255: Malforme= d conditional (${MACHINE:Nhost:Ncommon} !=3D "" && ${MACHINE} !=3D ${HOST= _MACHINE}) > make: Fatal errors encountered -- cannot continue > make: stopped in /root/git/freebsd older bmake: > ~/git/freebsd # WITH_DIRDEPS_BUILD=3Dyes make.bak -V MACHINE > amd64 --=20 Regards, Bryan Drewery --FsLaGPx9brUtgQhA83Ko1uKK85jHXtJDD-- --Pl3n94xGq40cdCKAnSnnfM6wPHTae6TTl Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJW5cL5AAoJEDXXcbtuRpfPIosIAJ1cILNyEWMacsSA4wfvQmMa +d3cnEQe1zTbsnnNCKWMDorlC3TdXlCDn4U74cRsrgdhQzh2wycTgBRUPiFgPN1P VcqB/H0h4n0bngB24z/fgyQz8rzshzosMrWzI8l/eEErOUnPrMzUjeL0QbgOvPWZ cgogbSXh6ESxuVKt+Zuf7rIPeO41APWu7oDfC9ZiuIGJ7YimldkDCR0QV6QKSHy5 ycOLg/YELT9DHbZKBgQv5Dh8adTfAlDXi+gVU7KJ8Fisxz2B2yFLbY/l0e/LspIf f0VlZ3ekMkNg6m3+y6yshMh1XFqb/mOo1JViawZ9wVX2EZME4s0k2QF5FL+74uo= =5rVh -----END PGP SIGNATURE----- --Pl3n94xGq40cdCKAnSnnfM6wPHTae6TTl--