Attachment 175718 Details for Bug 213446 – Proposed patch (since 423928 revision)

[patch] Proposed patch (since 423928 revision)

Mk.diff (text/plain), 2.08 KB, created by lightside on 2016-10-13 19:03:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2016-10-13 19:03:15 UTC

Size: 2.08 KB

patch

obsolete

>--- Mk.orig/Uses/cmake.mk	2016-09-09 19:42:46 UTC
>+++ Mk/Uses/cmake.mk
>@@ -78,11 +78,14 @@
> 			-DCMAKE_INSTALL_PREFIX:PATH="${CMAKE_INSTALL_PREFIX}" \
> 			-DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \
> 			-DTHREADS_HAVE_PTHREAD_ARG:BOOL=YES \
>-			-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=YES \
>-			-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
>+			-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=YES
> 
> CMAKE_INSTALL_PREFIX?=	${PREFIX}
> 
>+.ifndef NO_VERBOSE_BUILD
>+CMAKE_ARGS+=		-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
>+.endif
>+
> .if defined(BATCH) || defined(PACKAGE_BUILDING)
> CMAKE_NOCOLOR=		yes
> .endif
>--- Mk.orig/Uses/ninja.mk	2016-09-09 19:42:46 UTC
>+++ Mk/Uses/ninja.mk
>@@ -14,7 +14,9 @@
> IGNORE=	Incorrect 'USES+= ninja:${ninja_ARGS}' ninja takes no arguments
> .endif
> 
>+.ifndef NO_VERBOSE_BUILD
> MAKE_ARGS+=	-v
>+.endif
> 
> BUILD_DEPENDS+=	ninja:devel/ninja
> 
>--- Mk.orig/Uses/waf.mk	2016-10-13 16:26:09 UTC
>+++ Mk/Uses/waf.mk
>@@ -30,9 +30,12 @@
> MAKE_FLAGS=	#
> ALL_TARGET=	#
> HAS_CONFIGURE=	yes
>-MAKE_ARGS+=	--verbose
> WAF_CMD?=	./waf
> 
>+.ifndef NO_VERBOSE_BUILD
>+MAKE_ARGS+=	--verbose
>+.endif
>+
> CONFIGURE_TARGET?=	configure
> ALL_TARGET?=		build
> INSTALL_TARGET?=	install
>--- Mk.orig/bsd.port.mk	2016-09-09 19:42:46 UTC
>+++ Mk/bsd.port.mk
>@@ -810,6 +810,9 @@
> #				  Default: see below
> # MAKE_ARGS		- Any extra arguments to sub-make in build and install stages.
> #				  Default: none
>+#
>+# NO_VERBOSE_BUILD
>+#				- Define this to disable verbose build output.
> ##
> # MAKE_JOBS_UNSAFE
> #				- Disallow multiple jobs even when user set a global override.
>@@ -2507,7 +2510,7 @@
> 	if [ ! -z "`${CONFIGURE_CMD} --help 2>&1 | ${GREP} -- '--mandir'`" ]; then \
> 	    _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --mandir=${GNU_CONFIGURE_MANPREFIX}/man" ; \
> 	fi ; \
>-	if [ ! -z "`${CONFIGURE_CMD} --help 2>&1 | ${GREP} -- '--disable-silent-rules'`" ]; then \
>+	if [ -z "${NO_VERBOSE_BUILD}" ] && [ ! -z "`${CONFIGURE_CMD} --help 2>&1 | ${GREP} -- '--disable-silent-rules'`" ]; then \
> 	    _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --disable-silent-rules" ; \
> 	fi ; \
> 	if [ ! -z "`${CONFIGURE_CMD} --help 2>&1 | ${GREP} -- '--infodir'`" ]; then \

Actions: View | Diff

Attachments on bug 213446: 175704 | 175705 | 175718 | 175728 | 175729 | 175768 | 175772 | 175774 | 175775 | 175812 | 178899 | 180096