summaryrefslogtreecommitdiffstats
path: root/usr.bin/bmake
Commit message (Collapse)AuthorAgeFilesLines
* bmake 20151220sjg2016-01-041-2/+2
|
* MFC r266566:bdrewery2015-12-141-1/+0
| | | | | | | | | | | | | | | | | 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
* Merge bmake-20151201sjg2015-12-103-38/+106
|
* MFC r288154:bdrewery2015-09-291-1/+1
| | | | Similar to r266147, don't define PROG in the test subdirs.
* MFC r266074,r266104,r266147:ngie2014-12-30322-1/+2781
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r266074: Move old fmake tests into bmake and hook them to the build. This first step is mostly to prevent the code from rotting even further and to ensure these do not get wiped when fmake's code is removed from the tree. These tests are currently being skipped because they detect the underlying make is not fmake and thus disable themselves -- and the reason is that some of the tests fail, possibly due to legitimate bugs. Enabling them to run against bmake will come separately. Lastly, it would be ideal if these tests were fed upstream but they are not ready for that yet. In the interim, just put them under usr.bin/bmake/ while we sort things out. The existence of a different unit-tests directory within here makes me feel less guilty about this. Change confirmed working with a clean amd64 build. r266104: Undo changes to the generated Makefile. Move tests directory to proper location, including updating the test to work in the more-fragile fmake -> bmake bootstrap environment. r266147: Makefile.inc is also included by the tests subdirectory, which results in SUBDIRS having tests added to it, which fails. Work around this by checking to make sure tests exists before adding it to subdirs and work to get the generated file fixed so we can rename Makefile.inc to something else so it isn't automatically included by subdirs...
* MFC bmake changes to stable/10 ↵ngie2014-12-273-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (r255285,r255916,r258113,r258114,r261212,r266760,r268437) Discussed with: sjg r255285: If MAKE_JOB_ERROR_TOKEN is set to false, do not put an error token ("E") into the job queue. This avoids closing down an entire build on failure of one branch. Probably has no use outside the context of universe/tinderbox. Reviewed by: obrien r255916: Fix Fx syntax. PR: 182269 Approved by: re@ r258113: Avoid SEGV when passed NULL for list r258114: Don't SEGV when Hash_Table is uninitialized r261212: Merge bmake-20140101 from vendor r266760: Portmgr no longer need the UL hack. Reviewed by: obrien r268437: Update to bmake-20140620 Main change is detection of malformed variable references. Reviewed by: obrien
* Stick to traditional DEFAULT_SYS_PATH (/usr/share/mk)sjg2013-09-101-0/+1
| | | | | Reviewed by: obrien Approved by: re
* Merge bmake-20130904sjg2013-09-052-4/+5
|
* ParseGetLine: don't treat a zero byte as end of buffer if P_end says it isn't.sjg2013-08-101-1/+1
| | | | | Consume up to next newline, and issue a parse warning. If no newline found before P_end, carry on as before.
* Merge bmake-20130730sjg2013-08-023-7/+7
| | | | | Main feature of interest is .MAKE.JOB.PREFIX= to suppress --- job --- tokens.
* Update to bmake-20130604 to fix file descriptor leak.sjg2013-06-051-2/+2
|
* Sync with upstream version (20130520) that includes same fixes made last week.sjg2013-05-201-2/+2
|
* Per the comment, we cannot rely on bsd.own.mksjg2013-05-171-7/+6
| | | | | | we could be on an old system that knows noting of MK_BMAKE or on an almost up to date one that is defaulting it to "no" neither of which will work.
* We really need to get the bsd.own.mk from this tree so thesjg2013-05-171-0/+8
| | | | | correct options are set. Also defined NO_PWD_OVERRIDE to match behavior of fmake.
* guard against MK_SHARED_TOOLCHAIN not being defined.delphij2013-05-161-1/+1
|
* Similar to r250719: guard against MK_BMAKE not being defined.delphij2013-05-161-1/+1
|
* Update to bmake-20130330sjg2013-04-023-6/+7
|
* Missed adding Makefile.config and unit-tests/Makefile shouldsjg2013-02-042-0/+23
| | | | | | allow FreeBSD make to do 'obj'. Approved by: marcel (mentor)
* Merge bmake-20130123sjg2013-02-013-130/+94
| | | | Approved by: marcel (mentor)
* Merge bmake-20121111sjg2012-11-163-4/+10
| | | | | | Also pay attention to MK_SHARED_TOOLCHAIN. Approved by: marcel (mentor)
* Merge bmake-20121010sjg2012-10-251-8/+12
| | | | Approved by: marcel (mentor)
* Fix a bootstrapping problem where the first bmake (built by FreeBSD'smarcel2012-10-191-4/+3
| | | | | | | | | make) ended up being built with -DFORCE_MACHINE. This broke the lib32 built for amd64 & powerpc64. This fix is comes with the next import of bmake, but is committed here and now to minimize the exposure to the bug. Submitted by: Simon Gerraty <sjg@juniper.net>
* Obey the value of "MK_BMAKE".obrien2012-10-161-1/+1
|
* Add bmake to the build and allow it to be installed as make(1) insteadmarcel2012-10-064-0/+642
of FreeBSD's make by setting WITH_BMAKE. The WITH_BMAKE build makes it easy for people to switch while working out the kinks -- think ports tree here. The option will be removed in due time. Submitted by: Simon Gerraty (sjg@juniper.net)
OpenPOWER on IntegriCloud