Re: svn commit: r296637 - in head: contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests share/mk usr.bin/bmake

2016-03-27 Thread Jilles Tjoelker
On Sun, Mar 13, 2016 at 04:29:10PM -0700, Simon J. Gerraty wrote: > Bryan Drewery wrote: > > 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 :@ i

Re: svn commit: r296637 - in head: contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests share/mk usr.bin/bmake

2016-03-13 Thread Simon J. Gerraty
Bryan Drewery wrote: > Older bmake (with default MAKESYSPATH=.../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_VERSI

Re: svn commit: r296637 - in head: contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests share/mk usr.bin/bmake

2016-03-13 Thread Simon J. Gerraty
Bryan Drewery wrote: > 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? In the sense

Re: svn commit: r296637 - in head: contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests share/mk usr.bin/bmake

2016-03-13 Thread Bryan Drewery
On 3/13/2016 3:32 PM, Simon J. Gerraty wrote: > Bryan Drewery wrote: >>> # MACHINE specific depend files are supported, but *not* default. >>> # If any already exist, we should follow suit. >>> _aml = ${ALL_MACHINE_LIST:Uarm amd64 i386 powerpc:N${MACHINE}} ${MACHINE} >>> -# MACHINE must be the

Re: svn commit: r296637 - in head: contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests share/mk usr.bin/bmake

2016-03-13 Thread Simon J. Gerraty
Bryan Drewery wrote: > > # MACHINE specific depend files are supported, but *not* default. > > # If any already exist, we should follow suit. > > _aml = ${ALL_MACHINE_LIST:Uarm amd64 i386 powerpc:N${MACHINE}} ${MACHINE} > > -# MACHINE must be the last entry in _aml ;-) > > +# make sure we resto

Re: svn commit: r296637 - in head: contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests share/mk usr.bin/bmake

2016-03-11 Thread Bryan Drewery
On 3/11/2016 12:31 PM, Simon J. Gerraty wrote: > Bryan Drewery wrote: > >>> ~/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 > > Yes it is still true. >

Re: svn commit: r296637 - in head: contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests share/mk usr.bin/bmake

2016-03-11 Thread Simon J. Gerraty
Bryan Drewery wrote: > > ~/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 Yes it is still true. > usr.bin/bmake/Makefile because it is colliding with the

Re: svn commit: r296637 - in head: contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests share/mk usr.bin/bmake

2016-03-10 Thread Bryan Drewery
On 3/10/2016 5:35 PM, Simon J. Gerraty wrote: > Author: sjg > Date: Fri Mar 11 01:35:39 2016 > New Revision: 296637 > URL: https://svnweb.freebsd.org/changeset/base/296637 > > Log: > Merge bmake-20160307 > > Modified: > head/contrib/bmake/ChangeLog > head/contrib/bmake/Makefile ... > head

svn commit: r296637 - in head: contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests share/mk usr.bin/bmake

2016-03-10 Thread Simon J. Gerraty
Author: sjg Date: Fri Mar 11 01:35:39 2016 New Revision: 296637 URL: https://svnweb.freebsd.org/changeset/base/296637 Log: Merge bmake-20160307 Modified: head/contrib/bmake/ChangeLog head/contrib/bmake/Makefile head/contrib/bmake/arch.c head/contrib/bmake/bmake.1 head/contrib/bmake/bm