Attachment #173968 for bug #212075

Lines 10-15 Link Here

(-)CHANGES (+7 lines)
10		10
11	All ports committers are allowed to commit to this file.	11	All ports committers are allowed to commit to this file.
12		12
		13	20160822:
		14	AUTHOR: amdmi3@FreeBSD.org
		15
		16	Verbose build logs are now preferred and enabled by default for cmake,
		17	ninja and GNU configure. Other ports are strongly advised to switch to
		18	verbose logs where possible.
		19
13	20160821:	20	20160821:
14	AUTHOR: kde@FreeBSD.org	21	AUTHOR: kde@FreeBSD.org
15		22




# Additional variables that affect cmake behaviour:
#
# User defined variables:
# CMAKE_VERBOSE		- Enable verbose build output
#			Default: not set, unless BATCH or PACKAGE_BUILDING is defined
# CMAKE_NOCOLOR		- Disable colour build output
#			Default: not set, unless BATCH or PACKAGE_BUILDING is defined
# CMAKE_NINJA		- Use ninja instead of make(1)

			-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

CMAKE_INSTALL_PREFIX?=	${PREFIX}

.if defined(BATCH) || defined(PACKAGE_BUILDING)
CMAKE_VERBOSE=		yes
CMAKE_NOCOLOR=		yes
.endif

.if defined(CMAKE_VERBOSE)
CMAKE_ARGS+=		-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
.endif
.if defined(CMAKE_NOCOLOR)
CMAKE_ARGS+=		-DCMAKE_COLOR_MAKEFILE:BOOL=OFF
.endif




# Feature:		ninja
# Usage:		USES=ninja
#
# User defined variables:
# NINJA_VERBOSE		- Enable verbose output.
#
# MAINTAINER: portmgr@FreeBSD.org

.if !defined(_INCLUDE_USES_NINJA_MK)

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

.if defined(NINJA_VERBOSE)
MAKE_ARGS+=	-v
.endif

BUILD_DEPENDS+=	ninja:devel/ninja


Lines 2590-2596 Link Here

(-)Mk/bsd.port.mk (-1 / +1 lines)
2590	GNU_CONFIGURE_PREFIX?= ${PREFIX}	2590	GNU_CONFIGURE_PREFIX?= ${PREFIX}
2591	GNU_CONFIGURE_MANPREFIX?= ${MANPREFIX}	2591	GNU_CONFIGURE_MANPREFIX?= ${MANPREFIX}
2592	CONFIG_SITE?= ${PORTSDIR}/Templates/config.site	2592	CONFIG_SITE?= ${PORTSDIR}/Templates/config.site
2593	CONFIGURE_ARGS+= --prefix=${GNU_CONFIGURE_PREFIX} $${_LATE_CONFIGURE_ARGS}	2593	CONFIGURE_ARGS+= --prefix=${GNU_CONFIGURE_PREFIX} --disable-silent-rules $${_LATE_CONFIGURE_ARGS}
2594	.if defined(X_BUILD_FOR)	2594	.if defined(X_BUILD_FOR)
2595	CONFIGURE_ARGS+= --host=${X_BUILD_FOR}	2595	CONFIGURE_ARGS+= --host=${X_BUILD_FOR}
2596	.endif	2596	.endif

Return to bug 212075

Lines 12-19 Link Here

(-)Mk/Uses/cmake.mk (-7 / +2 lines)
12	# Additional variables that affect cmake behaviour:	12	# Additional variables that affect cmake behaviour:
13	#	13	#
14	# User defined variables:	14	# User defined variables:
15	# CMAKE_VERBOSE - Enable verbose build output
16	# Default: not set, unless BATCH or PACKAGE_BUILDING is defined
17	# CMAKE_NOCOLOR - Disable colour build output	15	# CMAKE_NOCOLOR - Disable colour build output
18	# Default: not set, unless BATCH or PACKAGE_BUILDING is defined	16	# Default: not set, unless BATCH or PACKAGE_BUILDING is defined
19	# CMAKE_NINJA - Use ninja instead of make(1)	17	# CMAKE_NINJA - Use ninja instead of make(1)
Lines 80-97 Link Here
80	-DCMAKE_INSTALL_PREFIX:PATH="${CMAKE_INSTALL_PREFIX}" \	78	-DCMAKE_INSTALL_PREFIX:PATH="${CMAKE_INSTALL_PREFIX}" \
81	-DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \	79	-DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \
82	-DTHREADS_HAVE_PTHREAD_ARG:BOOL=YES \	80	-DTHREADS_HAVE_PTHREAD_ARG:BOOL=YES \
83	-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=YES	81	-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=YES \
		82	-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
84		83
85	CMAKE_INSTALL_PREFIX?= ${PREFIX}	84	CMAKE_INSTALL_PREFIX?= ${PREFIX}
86		85
87	.if defined(BATCH) \|\| defined(PACKAGE_BUILDING)	86	.if defined(BATCH) \|\| defined(PACKAGE_BUILDING)
88	CMAKE_VERBOSE= yes
89	CMAKE_NOCOLOR= yes	87	CMAKE_NOCOLOR= yes
90	.endif	88	.endif
91		89
92	.if defined(CMAKE_VERBOSE)
93	CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
94	.endif
95	.if defined(CMAKE_NOCOLOR)	90	.if defined(CMAKE_NOCOLOR)
96	CMAKE_ARGS+= -DCMAKE_COLOR_MAKEFILE:BOOL=OFF	91	CMAKE_ARGS+= -DCMAKE_COLOR_MAKEFILE:BOOL=OFF
97	.endif	92	.endif

Lines 5-13 Link Here

(-)Mk/Uses/ninja.mk (-5 lines)
5	# Feature: ninja	5	# Feature: ninja
6	# Usage: USES=ninja	6	# Usage: USES=ninja
7	#	7	#
8	# User defined variables:
9	# NINJA_VERBOSE - Enable verbose output.
10	#
11	# MAINTAINER: portmgr@FreeBSD.org	8	# MAINTAINER: portmgr@FreeBSD.org
12		9
13	.if !defined(_INCLUDE_USES_NINJA_MK)	10	.if !defined(_INCLUDE_USES_NINJA_MK)
Lines 17-25 Link Here
17	IGNORE= Incorrect 'USES+= ninja:${ninja_ARGS}' ninja takes no arguments	14	IGNORE= Incorrect 'USES+= ninja:${ninja_ARGS}' ninja takes no arguments
18	.endif	15	.endif
19		16
20	.if defined(NINJA_VERBOSE)
21	MAKE_ARGS+= -v	17	MAKE_ARGS+= -v
22	.endif
23		18
24	BUILD_DEPENDS+= ninja:devel/ninja	19	BUILD_DEPENDS+= ninja:devel/ninja
25		20