Date: Sun, 13 Mar 2016 16:10:38 -0700 From: Bryan Drewery <bdrewery@FreeBSD.org> To: "Simon J. Gerraty" <sjg@juniper.net> Cc: src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org Subject: Re: svn commit: r296637 - in head: contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests share/mk usr.bin/bmake Message-ID: <56E5F36E.2020205@FreeBSD.org> In-Reply-To: <14946.1457908340@kaos.jnpr.net> References: <201603110135.u2B1Zd8a001604@repo.freebsd.org> <56E5C2EB.1070206@FreeBSD.org> <14946.1457908340@kaos.jnpr.net>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--j6VenBe37iiIrdW4NfbjImIEuKEMk7NxM
Content-Type: multipart/mixed; boundary="99LghlrNwV6EwttR69cJ6w1JadICmepgH"
From: Bryan Drewery <bdrewery@FreeBSD.org>
To: "Simon J. Gerraty" <sjg@juniper.net>
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 <bdrewery@FreeBSD.org> 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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?56E5F36E.2020205>