Date: Mon, 14 Dec 2015 17:43:00 -0800 From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: Re: svn commit: r292225 - stable/10/usr.bin/bmake Message-ID: <566F7024.3050800@FreeBSD.org> In-Reply-To: <201512142133.tBELXVJD041194@repo.freebsd.org> References: <201512142133.tBELXVJD041194@repo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On 12/14/2015 1:33 PM, Bryan Drewery wrote: > Author: bdrewery > Date: Mon Dec 14 21:33:31 2015 > New Revision: 292225 > URL: https://svnweb.freebsd.org/changeset/base/292225 > > Log: > MFC r266566: > > Add .../share/mk to the default system make path. This will fix the problem > with broken in-tree builds (which are used far more pervasively than I'd > known outside the tree). However, weird results may now happen if at any > point in the tree above you there happens to be a directory that has > subdirectory of share/mk, as unpredictable results will follow. This was > considered the lessor of the two evils, at least for now. In the future this > will be removed again when the underlying issues are resolved. > > For MFCing, this is to ensure that when upgrading to head the share/mk > in-tree is always used. Otherwise several build features will not work. > This passes a build using head's bmake which has this as the default > already. > > Relnotes: yes > > Modified: > stable/10/usr.bin/bmake/Makefile > Directory Properties: > stable/10/ (props changed) > > Modified: stable/10/usr.bin/bmake/Makefile > ============================================================================== > --- stable/10/usr.bin/bmake/Makefile Mon Dec 14 21:30:28 2015 (r292224) > +++ stable/10/usr.bin/bmake/Makefile Mon Dec 14 21:33:31 2015 (r292225) > @@ -167,7 +167,6 @@ accept test: > # override some simple things > BINDIR= /usr/bin > MANDIR= /usr/share/man/man > -DEFAULT_SYS_PATH= /usr/share/mk > > # make sure we get this > CFLAGS+= ${COPTS.${.IMPSRC:T}} > It's possible r279247 is needed, but I have not run into a case where it is. For the intent of using in-tree share/mk fully for building head from stable/10, it will already have r279247. A problem might come from building stable/10 on stable/10 without r279247, but everything seems fine to me. -- Regards, Bryan Drewery [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJWb3AkAAoJEDXXcbtuRpfPHmEIAKaKpL4QxgHL5g8CMId6E8GJ Iuoprr8vhqoGDlJt6KBDmh8IHIrLimVSsiLOMf89dTaBVLqSt7w5U4Tx0p803iAB gHnqnteHsjxzSnkZWe/QEUqMcMPMh0RdqATrqjMFZbQLFQmNnzkR/cyy5YnFB+9D OZKx3c5Vlu10kQMsvW46VsQhG8zZ1WiQGHt4afKaeJjas2Q7iS5lVjYht0wYvdZK F27g2NWwyc0BOZhHYcwZzBUsk4+aexdkmJuLH4RgMCJp0MGGXubyX53T+yvJdE9c yAEhZQTeuPHWJelxSQgnjqIEnfW2FcLi0H0IjmCexqhcg1PRcuDB118+VQY1EDc= =dSvR -----END PGP SIGNATURE-----help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?566F7024.3050800>