Attachment 219766 Details for Bug 251191 – Updated patch file

[patch] Updated patch file

Mk_Uses_ninja.mk.patch (text/plain), 1.35 KB, created by Yasuhiro Kimura on 2020-11-17 08:30:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2020-11-17 08:30:05 UTC

Size: 1.35 KB

patch

obsolete

>Index: Mk/Uses/ninja.mk
>===================================================================
>--- Mk/Uses/ninja.mk	(revision 555512)
>+++ Mk/Uses/ninja.mk	(working copy)
>@@ -14,16 +14,14 @@
> IGNORE=	Incorrect 'USES+= ninja:${ninja_ARGS}' ninja takes no arguments
> .endif
> 
>-MAKE_ARGS+=	-v
>-
> BUILD_DEPENDS+=	ninja:devel/ninja
> 
> CMAKE_ARGS+=	-GNinja
>-MAKEFILE=
>-MAKE_CMD=	ninja
>-MAKE_FLAGS=
>-# Set a minimal job of 1
>-_MAKE_JOBS=	-j${MAKE_JOBS_NUMBER}
>+# 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
>Index: Mk/bsd.port.mk
>===================================================================
>--- Mk/bsd.port.mk	(revision 555512)
>+++ Mk/bsd.port.mk	(working copy)
>@@ -3382,9 +3382,10 @@
> 
> # Install
> 
>+DO_MAKE_INSTALL?=	${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
> .if !target(do-install) && !defined(NO_INSTALL)
> do-install:
>-	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
>+	@(cd ${INSTALL_WRKSRC} && ${DO_MAKE_INSTALL} ${INSTALL_TARGET})
> .endif
> 
> # Test

Actions: View | Diff

Attachments on bug 251191: 219737 | 219766 | 220329