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). Simple test on a port > that does not set any MAKE_JOBS_* stuff, e.g. games/qcc: > > $ make -V MAKE_JOBS_NUMBER > `/sbin/sysctl -n kern.smp.cpus` > $ make -V MAKE_JOBS_NUMBER -DDISABLE_MAKE_JOBS > 1 > $ make -V MAKE_JOBS_NUMBER -DMAKE_JOBS_UNSAFE > 1 > $ make -V MAKE_JOBS_NUMBER -DMAKE_JOBS_SAFE > `/sbin/sysctl -n kern.smp.cpus` > $ make -V MAKE_JOBS_NUMBER -DFORCE_MAKE_JOBS > `/sbin/sysctl -n kern.smp.cpus` > > Can you show how can I get undefined _MAKE_JOBS? > > ./danfe >
I see now. You removed this -.if defined(MAKE_JOBS_SAFE) || defined(FORCE_MAKE_JOBS) So it should be fine now. -- Regards, Bryan Drewery
signature.asc
Description: OpenPGP digital signature
