From owner-svn-src-head@freebsd.org Fri Mar 11 21:14:28 2016 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 0CCF3ACDF46; Fri, 11 Mar 2016 21:14:28 +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 E298E3C9; Fri, 11 Mar 2016 21:14:27 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id D308918E7; Fri, 11 Mar 2016 21:14:27 +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 83A3E1E6E7; Fri, 11 Mar 2016 21:14:27 +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 WBH_LGgB1s7W; Fri, 11 Mar 2016 21:14:25 +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 A3BA31E6E1 To: "Simon J. Gerraty" References: <201603110135.u2B1Zd8a001604@repo.freebsd.org> <56E243ED.5050803@FreeBSD.org> <81518.1457728319@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: <56E33536.2000407@FreeBSD.org> Date: Fri, 11 Mar 2016 13:14:30 -0800 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: <81518.1457728319@kaos.jnpr.net> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="oqcdT5FRsf27LrxCVhGxsptKUVboe0Sv4" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.21 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: Fri, 11 Mar 2016 21:14:28 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --oqcdT5FRsf27LrxCVhGxsptKUVboe0Sv4 Content-Type: multipart/mixed; boundary="oMIu7B8BBExIUQ1LJFKIC3eUdIgKiGudJ" From: Bryan Drewery To: "Simon J. Gerraty" Cc: src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org Message-ID: <56E33536.2000407@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> <56E243ED.5050803@FreeBSD.org> <81518.1457728319@kaos.jnpr.net> In-Reply-To: <81518.1457728319@kaos.jnpr.net> --oMIu7B8BBExIUQ1LJFKIC3eUdIgKiGudJ Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 3/11/2016 12:31 PM, Simon J. Gerraty wrote: > Bryan Drewery wrote: >=20 >>> ~/git/freebsd # head usr.bin/bmake/Makefile >>> # This is a generated file, do NOT edit! >>> # See contrib/bmake/bsd.after-import.mk >> >> Is this still true? I have to rename MAKE_VERSION in >=20 > Yes it is still true. >=20 >> usr.bin/bmake/Makefile because it is colliding with the built-in >> MAKE_VERSION breaking my upgrade checks in bsd.dep.mk when trying to >> build the new bmake itself. >=20 > Sounds like you might have a bug. > What is the specific issue? >=20 Older bmake (with default MAKESYSPATH=3D.../share/mk) running 'make upgrade_checks' in top-level which builds latest bmake in usr.bin/bmake which uses share/mk/bsd.dep.mk where I check MAKE_VERSION for .dinclude support. Since usr.bin/bmake/Makefile overrides MAKE_VERSION then the check later in bsd.dep.mk fails because it thinks .dinclude is available when it is not. At least on older releases the make doesn't default MAKESYSPATH to =2E../share/mk so it uses the installed /usr/share/mk which avoids the problem, but only assuming someone didn't commit code anticipating a release with a specific MAKE_VERSION like I almost did this week. I renamed it to _MAKE_VERSION to avoid the problem in usr.bin/bmake/Makefile. --=20 Regards, Bryan Drewery --oMIu7B8BBExIUQ1LJFKIC3eUdIgKiGudJ-- --oqcdT5FRsf27LrxCVhGxsptKUVboe0Sv4 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 iQEcBAEBAgAGBQJW4zU2AAoJEDXXcbtuRpfPWBIH/2wuhq1UAGCcjL/asVLJb3fV cubAN15LahuKkeeki/HeLkTWvvPbBvC3u/Mstmh/P/qxGA9m72X6a5d6Ha5+pqAi 90CTVGY6BIoeTxkACGf10Q2lHEFNN9bTMtgbxvWqSZm4oEzAHqjoej0bS6kXkxZJ aO3e87KA0e/4W9mOybQ6SA/Jvp4FwNHOt5ILByc/lcdUBG8o6uemNjOSNZlvgjAZ GB1IptNfH6GMVqHJMVMqpbzLgszfJpEnJdKOS/oHg8AwBIQX4+lWLDa2CCJL8T29 vaa2LumrIIxVm4g97BQeGdkqXqna8N7z7u3kDJPnuZ1a+E+WyV5CeAAyDQICNfk= =lHri -----END PGP SIGNATURE----- --oqcdT5FRsf27LrxCVhGxsptKUVboe0Sv4--