Attachment #219766 for bug #251191




IGNORE=	Incorrect 'USES+= ninja:${ninja_ARGS}' ninja takes no arguments
.endif

MAKE_ARGS+=	-v

BUILD_DEPENDS+=	ninja:devel/ninja

CMAKE_ARGS+=	-GNinja
# Intended to be used to pass options to ninja
NINJA_FLAGS?=
DO_MAKE_BUILD=	${SETENV} ${MAKE_ENV} ninja -v -j${MAKE_JOBS_NUMBER} ${NINJA_FLAGS}
DO_MAKE_INSTALL=	${SETENV} ${MAKE_ENV} ninja -v -j${MAKE_JOBS_NUMBER} ${NINJA_FLAGS}
DO_MAKE_TEST=	${SETENV} ${TEST_ENV} ninja -v -j${MAKE_JOBS_NUMBER} ${NINJA_FLAGS}
_DESTDIR_VIA_ENV=	yes

.endif

Lines 3382-3390 Link Here

(-)Mk/bsd.port.mk (-1 / +2 lines)
3382		3382
3383	# Install	3383	# Install
3384		3384
		3385	DO_MAKE_INSTALL?= ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
3385	.if !target(do-install) && !defined(NO_INSTALL)	3386	.if !target(do-install) && !defined(NO_INSTALL)
3386	do-install:	3387	do-install:
3387	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})	3388	@(cd ${INSTALL_WRKSRC} && ${DO_MAKE_INSTALL} ${INSTALL_TARGET})
3388	.endif	3389	.endif
3389		3390
3390	# Test	3391	# Test

Return to bug 251191

Lines 14-29 Link Here

(-)Mk/Uses/ninja.mk (-7 / +5 lines)
14	IGNORE= Incorrect 'USES+= ninja:${ninja_ARGS}' ninja takes no arguments	14	IGNORE= Incorrect 'USES+= ninja:${ninja_ARGS}' ninja takes no arguments
15	.endif	15	.endif
16		16
17	MAKE_ARGS+= -v
18
19	BUILD_DEPENDS+= ninja:devel/ninja	17	BUILD_DEPENDS+= ninja:devel/ninja
20		18
21	CMAKE_ARGS+= -GNinja	19	CMAKE_ARGS+= -GNinja
22	MAKEFILE=	20	# Intended to be used to pass options to ninja
23	MAKE_CMD= ninja	21	NINJA_FLAGS?=
24	MAKE_FLAGS=	22	DO_MAKE_BUILD= ${SETENV} ${MAKE_ENV} ninja -v -j${MAKE_JOBS_NUMBER} ${NINJA_FLAGS}
25	# Set a minimal job of 1	23	DO_MAKE_INSTALL= ${SETENV} ${MAKE_ENV} ninja -v -j${MAKE_JOBS_NUMBER} ${NINJA_FLAGS}
26	_MAKE_JOBS= -j${MAKE_JOBS_NUMBER}	24	DO_MAKE_TEST= ${SETENV} ${TEST_ENV} ninja -v -j${MAKE_JOBS_NUMBER} ${NINJA_FLAGS}
27	_DESTDIR_VIA_ENV= yes	25	_DESTDIR_VIA_ENV= yes
28		26
29	.endif	27	.endif