From owner-svn-src-all@freebsd.org Sun Mar 13 23:10:41 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 3C5D9ACF7C6; Sun, 13 Mar 2016 23:10:41 +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 1C69EC7C; Sun, 13 Mar 2016 23:10:41 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id 148AB1794; Sun, 13 Mar 2016 23:10:41 +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 CA8561E1A4; Sun, 13 Mar 2016 23:10:40 +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 YZpLeb-KDX6x; Sun, 13 Mar 2016 23:10:33 +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 39E151E19F To: "Simon J. Gerraty" References: <201603110135.u2B1Zd8a001604@repo.freebsd.org> <56E5C2EB.1070206@FreeBSD.org> <14946.1457908340@kaos.jnpr.net> Cc: src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: <56E5F36E.2020205@FreeBSD.org> Date: Sun, 13 Mar 2016 16:10:38 -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: <14946.1457908340@kaos.jnpr.net> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="j6VenBe37iiIrdW4NfbjImIEuKEMk7NxM" 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 23:10:41 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --j6VenBe37iiIrdW4NfbjImIEuKEMk7NxM Content-Type: multipart/mixed; boundary="99LghlrNwV6EwttR69cJ6w1JadICmepgH" From: Bryan Drewery To: "Simon J. Gerraty" Cc: src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org Message-ID: <56E5F36E.2020205@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> <56E5C2EB.1070206@FreeBSD.org> <14946.1457908340@kaos.jnpr.net> In-Reply-To: <14946.1457908340@kaos.jnpr.net> --99LghlrNwV6EwttR69cJ6w1JadICmepgH Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 3/13/2016 3:32 PM, Simon J. Gerraty wrote: > Bryan Drewery wrote: >>> # 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}} ${M= ACHINE} >>> -# 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 >=20 > deleting the :@ loop iterator variable. >=20 >> get MACHINE defined with DIRDEPS_BUILD without this change. That's no= t >> ideal since it breaks older builds. >=20 > Yes, I should mfc the above change? it is harmess with older bmake's. >=20 This code is only in head. My problem is now bmake can only build commits after this one which breaks bisecting and older project branches which haven't or can't merge in head yet. Is the :@ iterator variable deletion change in bmake change necessary? --=20 Regards, Bryan Drewery --99LghlrNwV6EwttR69cJ6w1JadICmepgH-- --j6VenBe37iiIrdW4NfbjImIEuKEMk7NxM 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 iQEcBAEBAgAGBQJW5fNuAAoJEDXXcbtuRpfPr8sIAKNO3C4CyOwGzPrcTiFo+Hl3 hQXqApTdbv4PsLNb4BIOxzYdVnLpMeMl522YOUHipQLIYjmAImCo0MciJIxXW7ul WriL/Cz4nc4YZffPvc/vVfWK7vfbwWJaToyyfSxrEb4o4taBPO1N//Wl8e1RB0By baxn9RwBss5DEzu3GeI18NrEyRJngCxTXf61OP06jJgA0MAPTxYi/S94J38QlcwJ XjSnZKSn86gQVGq1/HxL+vLpybpbaRMW3W56Hv0sxvZiyFtlAShxN7lYaC+H9VRE whjezC8HQLrC7i9yAa0NU5PnTzChjRVqR2RXORTh2jBylO8wze1WBVQGZ7og9ic= =gtyJ -----END PGP SIGNATURE----- --j6VenBe37iiIrdW4NfbjImIEuKEMk7NxM--