Date: Thu, 23 May 2013 14:26:31 +0000 From: Alexey Dokuchaev <danfe@FreeBSD.org> To: Bryan Drewery <bdrewery@FreeBSD.org> Cc: Martin Wilke <miwi.freebsd@gmail.com>, Chris Rees <crees@freebsd.org>, Ports Management Team <portmgr@freebsd.org>, FreeBSD Ports <ports@freebsd.org>, Eitan Adler <lists@eitanadler.com>, Olivier Smedts <olivier@gid0.org>, Martin Wilke <miwi@bsdhash.org>, Bryan Drewery <bryan@shatow.net> Subject: Re: Plans for making MAKE_JOBS_SAFE the default? Message-ID: <20130523142631.GA68535@FreeBSD.org> In-Reply-To: <519E243D.9020501@FreeBSD.org> References: <CABzXLYNQBVZAkL%2B-HMUVduzq_UKLEjbQFE4zn_KhCBE3agX-Hw@mail.gmail.com> <CAF6rxgmx0bJcW-iP_a8B3y9x9T%2BxF0MNsW55ciJJOnKPfQEMSA@mail.gmail.com> <CADLo83-126TsyWatUREysrk2gR7%2BacxWqTxmW0WhwH=QYW=hfg@mail.gmail.com> <CAF6rxgk-kL6UXRES6KWqQtOSd6rvKV4E-hgHLcAXSCEA9vVy-g@mail.gmail.com> <1A22DCEC-9548-4FD2-BFC5-4F3F4EC1E1C2@gmail.com> <A8B05539-6878-48DE-8DC0-3323263594AF@bsdhash.org> <20130523075627.GA79696@FreeBSD.org> <519E0912.4070500@FreeBSD.org> <20130523130041.GA47068@FreeBSD.org> <519E243D.9020501@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, May 23, 2013 at 09:14:21AM -0500, Bryan Drewery wrote: > On 5/23/2013 8:00 AM, Alexey Dokuchaev wrote: > > On Thu, May 23, 2013 at 07:18:26AM -0500, Bryan Drewery wrote: > >> On 5/23/2013 2:56 AM, Alexey Dokuchaev wrote: > >>> FORCE_MAKE_JOBS is removed because it is the default. While here, I've > >>> moved empty(MAKE_JOBS_NUMBER) check higher, IMHO where it should belong, > >>> also saves a few lines. Reviews are welcome. > >> > >> Moving MAKE_JOBS_NUMBER is wrong, see r317639 > > > > Hmm, can you explain a bit more? Maybe I am missing something here, but > > as I read log for r317639: > > > > "[F]ix MAKE_JOBS_NUMBER not being set if none of DISABLE_MAKE_JOBS or > > MAKE_JOBS_UNSAFE or MAKE_JOBS_SAFE or FORCE_MAKE_JOBS were set." > > > > Previously (without my patch) it could happen because of nested .if's. Now > > _MAKE_JOBS is set in both branches (true and false). [...] > > I see now. You removed this > > -.if defined(MAKE_JOBS_SAFE) || defined(FORCE_MAKE_JOBS) > > So it should be fine now. Right. Just to make it clear (for everyone who is reading): previously we needed FORCE_MAKE_JOBS as it was not the default; now we don't need it and it was removed; thus making second .if check needless. Ergo, we can easily ensure that _MAKE_JOBS_NUMBER is always set now, without using the separate check for its emptiness (after the .if). ./danfe
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130523142631.GA68535>