View | Details | Raw Unified | Return to bug 212075 | Differences between
and this patch

Collapse All | Expand All

(-)CHANGES (+7 lines)
Lines 10-15 Link Here
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
20160906:
14
AUTHOR: amdmi3@FreeBSD.org
15
16
  Verbose build logs are now preferred and enabled by default for cmake,
17
  ninja and GNU configure.  Ports which still produce quiet build logs
18
  (hiding actual commands) are strongly advised to switch to verbose logs.
19
13
20160824:
20
20160824:
14
AUTHOR: mat@FreeBSD.org
21
AUTHOR: mat@FreeBSD.org
15
22
(-)Mk/Uses/cmake.mk (-7 / +2 lines)
Lines 12-19 Link Here
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
(-)Mk/Uses/ninja.mk (-5 lines)
Lines 5-13 Link Here
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
(-)Mk/bsd.port.mk (-1 / +1 lines)
Lines 2487-2493 Link Here
2487
GNU_CONFIGURE_PREFIX?=	${PREFIX}
2487
GNU_CONFIGURE_PREFIX?=	${PREFIX}
2488
GNU_CONFIGURE_MANPREFIX?=	${MANPREFIX}
2488
GNU_CONFIGURE_MANPREFIX?=	${MANPREFIX}
2489
CONFIG_SITE?=		${PORTSDIR}/Templates/config.site
2489
CONFIG_SITE?=		${PORTSDIR}/Templates/config.site
2490
CONFIGURE_ARGS+=	--prefix=${GNU_CONFIGURE_PREFIX} $${_LATE_CONFIGURE_ARGS}
2490
CONFIGURE_ARGS+=	--prefix=${GNU_CONFIGURE_PREFIX} --disable-silent-rules $${_LATE_CONFIGURE_ARGS}
2491
.if defined(X_BUILD_FOR)
2491
.if defined(X_BUILD_FOR)
2492
CONFIGURE_ARGS+=	--host=${X_BUILD_FOR}
2492
CONFIGURE_ARGS+=	--host=${X_BUILD_FOR}
2493
.endif
2493
.endif
(-)audio/speex/files/patch-configure (+10 lines)
Line 0 Link Here
1
--- configure.orig	2014-12-06 19:58:24 UTC
2
+++ configure
3
@@ -2486,6 +2486,7 @@ case $enable_silent_rules in # (((
4
    no) AM_DEFAULT_VERBOSITY=1;;
5
     *) AM_DEFAULT_VERBOSITY=0;;
6
 esac
7
+unset enableval
8
 am_make=${MAKE-make}
9
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
10
 $as_echo_n "checking whether $am_make supports nested variables... " >&6; }
(-)devel/libclc/Makefile (-2 / +2 lines)
Lines 15-21 Link Here
15
GH_ACCOUNT=	llvm-mirror
15
GH_ACCOUNT=	llvm-mirror
16
GH_TAGNAME=	6d78407
16
GH_TAGNAME=	6d78407
17
17
18
GNU_CONFIGURE=	yes
19
USES=		gmake python:2,build ninja
18
USES=		gmake python:2,build ninja
20
USE_LDCONFIG=	yes
19
USE_LDCONFIG=	yes
21
MAKE_ENV=	MAKE=${GMAKE} DESTDIR=${STAGEDIR}
20
MAKE_ENV=	MAKE=${GMAKE} DESTDIR=${STAGEDIR}
Lines 35-40 Link Here
35
do-configure:
34
do-configure:
36
	@cd ${WRKSRC} && ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS} -g ninja \
35
	@cd ${WRKSRC} && ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS} -g ninja \
37
		--with-llvm-config=${LOCALBASE}/bin/llvm-config${LLVMVER} \
36
		--with-llvm-config=${LOCALBASE}/bin/llvm-config${LLVMVER} \
38
		--pkgconfigdir=${PREFIX}/libdata/pkgconfig
37
		--pkgconfigdir=${PREFIX}/libdata/pkgconfig \
38
		--prefix=${PREFIX}
39
39
40
.include <bsd.port.mk>
40
.include <bsd.port.mk>

Return to bug 212075