Date: Fri, 11 Mar 2016 13:14:30 -0800 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: <56E33536.2000407@FreeBSD.org> In-Reply-To: <81518.1457728319@kaos.jnpr.net> References: <201603110135.u2B1Zd8a001604@repo.freebsd.org> <56E243ED.5050803@FreeBSD.org> <81518.1457728319@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) --oqcdT5FRsf27LrxCVhGxsptKUVboe0Sv4 Content-Type: multipart/mixed; boundary="oMIu7B8BBExIUQ1LJFKIC3eUdIgKiGudJ" 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: <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 <bdrewery@FreeBSD.org> 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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?56E33536.2000407>