d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
199,209 Commits 4 Branches 49 Tags
Commit Graph

24 Commits

Author SHA1 Message Date
imp
c3c632cdb8 Fix the upgrade path for fmake by allowing the include of src.opts.mk 
to fail and falling back on the conservative testing of variables
already in place. This should stop the tide of tinderbox mail.
 2014-05-06 14:33:18 +00:00
se
aecb1b76ec Revert r265436, since it is not the correct fix. 2014-05-06 14:01:48 +00:00
se
a1bd83e689 Fix include statement to accept src.opts.mk from a source directory 
instead of from /usr/share/mk.

I'm not sure that this will let buildworld complete on a system with
no installed src.opts.mk (make buildworld is still running), but the
tinderbox builds are all failing earlyon without this patch.
 2014-05-06 12:31:17 +00:00
imp
3be1d4bf0f Remove support for WITHOUT_BMAKE. bmake is now the only make that can 
build world, so it is the only make we build or install. fmake is
still in the tree, but disconnected, and upgrades from older systems
that still have bmake has not been removed, but its state has not been
tested (it should work given how minimal the work to upgrade to bmake
is).
 2014-05-06 04:22:37 +00:00
imp
2118f42afd Use src.opts.mk in preference to bsd.own.mk except where we need stuff 
from the latter.
 2014-05-06 04:22:01 +00:00
sjg
a327d8d253 Merge bmake-20140101 from vendor 2014-01-27 17:47:21 +00:00
sjg
e9b1b9b12c Stick to traditional DEFAULT_SYS_PATH (/usr/share/mk) 
Reviewed by:	obrien
Approved by:	re
 2013-09-10 23:31:38 +00:00
sjg
61d13f6983 Merge bmake-20130904 2013-09-05 15:57:26 +00:00
sjg
0e7402e046 ParseGetLine: don't treat a zero byte as end of buffer if P_end says it isn't. 
Consume up to next newline, and issue a parse warning.
If no newline found before P_end, carry on as before.
 2013-08-10 21:31:35 +00:00
sjg
ff765cb371 Merge bmake-20130730 
Main feature of interest is .MAKE.JOB.PREFIX=
to suppress --- job --- tokens.
 2013-08-02 06:25:28 +00:00
sjg
5d26938b1d Update to bmake-20130604 to fix file descriptor leak. 2013-06-05 16:12:50 +00:00
sjg
4cdc15c1f7 Sync with upstream version (20130520) that includes same fixes made last week. 2013-05-20 22:51:11 +00:00
sjg
43bd9a7422 Per the comment, we cannot rely on bsd.own.mk 
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.
 2013-05-17 22:18:27 +00:00
sjg
155b65a40f We really need to get the bsd.own.mk from this tree so the 
correct options are set.
Also defined NO_PWD_OVERRIDE to match behavior of fmake.
 2013-05-17 19:37:16 +00:00
delphij
cf9651690f guard against MK_SHARED_TOOLCHAIN not being defined. 2013-05-16 22:35:33 +00:00
delphij
5c440a6605 Similar to r250719: guard against MK_BMAKE not being defined. 2013-05-16 22:25:17 +00:00
sjg
e2bb503df7 Update to bmake-20130330 2013-04-02 21:31:11 +00:00
sjg
2a731cd0dd Missed adding Makefile.config and unit-tests/Makefile should 
allow FreeBSD make to do 'obj'.

Approved by:	marcel (mentor)
 2013-02-04 17:41:17 +00:00
sjg
f817112dff Merge bmake-20130123 
Approved by:	marcel (mentor)
 2013-02-01 22:55:27 +00:00
sjg
d281294411 Merge bmake-20121111 
Also pay attention to MK_SHARED_TOOLCHAIN.

Approved by:	marcel (mentor)
 2012-11-16 01:37:25 +00:00
sjg
f8768a6120 Merge bmake-20121010 
Approved by:	marcel (mentor)
 2012-10-25 23:18:05 +00:00
marcel
c9d76d3d67 Fix a bootstrapping problem where the first bmake (built by FreeBSD's 
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>
 2012-10-19 19:56:17 +00:00
obrien
326e102c78 Obey the value of "MK_BMAKE". 2012-10-16 15:43:16 +00:00
marcel
bd137de2db Add bmake to the build and allow it to be installed as make(1) instead 
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)
 2012-10-06 19:19:21 +00:00