On 2018/09/10 15:26, Brian Callahan wrote:
> Hi Stuart --
..
> Please go ahead. OK for me to import.
Thanks, committed.
> > And here's a simpler cmake.port.mk diff using "USE_NINJA=samurai"
> > rather than a separate variable (though I am rather tempted to just
> > switch the cmake module to using samurai if it works in bulk build,
> > diffable build logs is a BIG improvement).
>
> I don't have the capacity to do full bulk builds here, but when I first
> ported samurai I tried every cmake and meson port I could reasonably build
> and everything worked. And we can always change to Samurai later if it
> survives a bulk. So ok for the cmake.port.mk bits too.
I'll sleep on this one first but I don't see a downside - I'll give
it a spin in bulk build when the machines are free.
> ~Brian
>
> > Index: cmake.port.mk
> > ===================================================================
> > RCS file: /cvs/ports/devel/cmake/cmake.port.mk,v
> > retrieving revision 1.63
> > diff -u -p -r1.63 cmake.port.mk
> > --- cmake.port.mk 26 Jan 2018 13:11:14 -0000 1.63
> > +++ cmake.port.mk 10 Sep 2018 19:03:50 -0000
> > @@ -16,9 +16,16 @@ USE_NINJA = No
> > .if ${USE_NINJA:L} == "yes"
> > BUILD_DEPENDS += devel/ninja>=1.5.1
> > -_MODCMAKE_GEN = Ninja
> > NINJA ?= ninja
> > NINJA_FLAGS ?= -v -j ${MAKE_JOBS}
> > +.elif ${USE_NINJA:L} == "samurai"
> > +BUILD_DEPENDS += devel/samurai
> > +NINJA ?= samu
> > +NINJA_FLAGS ?= -v -j ${MAKE_JOBS}
> > +.endif
> > +
> > +.if ${USE_NINJA:L} == "yes" || ${USE_NINJA:L} == "samurai"
> > +_MODCMAKE_GEN = Ninja
> > MODCMAKE_BUILD_TARGET = cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} \
> > ${NINJA} ${NINJA_FLAGS} ${ALL_TARGET}
> > MODCMAKE_INSTALL_TARGET = cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} \
> >
>
