Attachment #175718 for bug #213446




			-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}

.ifndef NO_VERBOSE_BUILD
CMAKE_ARGS+=		-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
.endif

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

Lines 14-20 Link Here

(-)Mk/Uses/ninja.mk (+2 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	.ifndef NO_VERBOSE_BUILD
17	MAKE_ARGS+= -v	18	MAKE_ARGS+= -v
		19	.endif
18		20
19	BUILD_DEPENDS+= ninja:devel/ninja	21	BUILD_DEPENDS+= ninja:devel/ninja
20		22




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

Lines 810-815 Link Here

(-)Mk/bsd.port.mk (-1 / +4 lines)
810	# Default: see below	810	# Default: see below
811	# MAKE_ARGS - Any extra arguments to sub-make in build and install stages.	811	# MAKE_ARGS - Any extra arguments to sub-make in build and install stages.
812	# Default: none	812	# Default: none
		813	#
		814	# NO_VERBOSE_BUILD
		815	# - Define this to disable verbose build output.
813	##	816	##
814	# MAKE_JOBS_UNSAFE	817	# MAKE_JOBS_UNSAFE
815	# - Disallow multiple jobs even when user set a global override.	818	# - Disallow multiple jobs even when user set a global override.
Lines 2507-2513 Link Here
2507	if [ ! -z "`${CONFIGURE_CMD} --help 2>&1 \| ${GREP} -- '--mandir'`" ]; then \	2510	if [ ! -z "`${CONFIGURE_CMD} --help 2>&1 \| ${GREP} -- '--mandir'`" ]; then \
2508	_LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --mandir=${GNU_CONFIGURE_MANPREFIX}/man" ; \	2511	_LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --mandir=${GNU_CONFIGURE_MANPREFIX}/man" ; \
2509	fi ; \	2512	fi ; \
2510	if [ ! -z "`${CONFIGURE_CMD} --help 2>&1 \| ${GREP} -- '--disable-silent-rules'`" ]; then \	2513	if [ -z "${NO_VERBOSE_BUILD}" ] && [ ! -z "`${CONFIGURE_CMD} --help 2>&1 \| ${GREP} -- '--disable-silent-rules'`" ]; then \
2511	_LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --disable-silent-rules" ; \	2514	_LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --disable-silent-rules" ; \
2512	fi ; \	2515	fi ; \
2513	if [ ! -z "`${CONFIGURE_CMD} --help 2>&1 \| ${GREP} -- '--infodir'`" ]; then \	2516	if [ ! -z "`${CONFIGURE_CMD} --help 2>&1 \| ${GREP} -- '--infodir'`" ]; then \

Return to bug 213446

Lines 78-88 Link Here

(-)Mk/Uses/cmake.mk (-2 / +5 lines)
78	-DCMAKE_INSTALL_PREFIX:PATH="${CMAKE_INSTALL_PREFIX}" \	78	-DCMAKE_INSTALL_PREFIX:PATH="${CMAKE_INSTALL_PREFIX}" \
79	-DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \	79	-DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \
80	-DTHREADS_HAVE_PTHREAD_ARG:BOOL=YES \	80	-DTHREADS_HAVE_PTHREAD_ARG:BOOL=YES \
81	-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=YES \	81	-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=YES
82	-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
83		82
84	CMAKE_INSTALL_PREFIX?= ${PREFIX}	83	CMAKE_INSTALL_PREFIX?= ${PREFIX}
85		84
		85	.ifndef NO_VERBOSE_BUILD
		86	CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
		87	.endif
		88
86	.if defined(BATCH) \|\| defined(PACKAGE_BUILDING)	89	.if defined(BATCH) \|\| defined(PACKAGE_BUILDING)
87	CMAKE_NOCOLOR= yes	90	CMAKE_NOCOLOR= yes
88	.endif	91	.endif

Lines 30-38 Link Here

(-)Mk/Uses/waf.mk (-1 / +4 lines)
30	MAKE_FLAGS= #	30	MAKE_FLAGS= #
31	ALL_TARGET= #	31	ALL_TARGET= #
32	HAS_CONFIGURE= yes	32	HAS_CONFIGURE= yes
33	MAKE_ARGS+= --verbose
34	WAF_CMD?= ./waf	33	WAF_CMD?= ./waf
35		34
		35	.ifndef NO_VERBOSE_BUILD
		36	MAKE_ARGS+= --verbose
		37	.endif
		38
36	CONFIGURE_TARGET?= configure	39	CONFIGURE_TARGET?= configure
37	ALL_TARGET?= build	40	ALL_TARGET?= build
38	INSTALL_TARGET?= install	41	INSTALL_TARGET?= install