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
signature.asc
Description: OpenPGP digital signature