Attachment 174417 Details for Bug 212075 – Patch v2

[patch] Patch v2

verbose-build.patch (text/plain), 4.37 KB, created by Dmitry Marakasov on 2016-09-06 15:08:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2016-09-06 15:08:34 UTC

Size: 4.37 KB

patch

obsolete

>Index: CHANGES
>===================================================================
>--- CHANGES	(revision 421435)
>+++ CHANGES	(working copy)
>@@ -10,6 +10,13 @@
> 
> All ports committers are allowed to commit to this file.
> 
>+20160906:
>+AUTHOR: amdmi3@FreeBSD.org
>+
>+  Verbose build logs are now preferred and enabled by default for cmake,
>+  ninja and GNU configure.  Ports which still produce quiet build logs
>+  (hiding actual commands) are strongly advised to switch to verbose logs.
>+
> 20160824:
> AUTHOR: mat@FreeBSD.org
> 
>Index: Mk/Uses/cmake.mk
>===================================================================
>--- Mk/Uses/cmake.mk	(revision 421435)
>+++ Mk/Uses/cmake.mk	(working copy)
>@@ -12,8 +12,6 @@
> # 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)
>@@ -80,18 +78,15 @@
> 			-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_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
>Index: Mk/Uses/ninja.mk
>===================================================================
>--- Mk/Uses/ninja.mk	(revision 421435)
>+++ Mk/Uses/ninja.mk	(working copy)
>@@ -5,9 +5,6 @@
> # Feature:		ninja
> # Usage:		USES=ninja
> #
>-# User defined variables:
>-# NINJA_VERBOSE		- Enable verbose output.
>-#
> # MAINTAINER: portmgr@FreeBSD.org
> 
> .if !defined(_INCLUDE_USES_NINJA_MK)
>@@ -17,9 +14,7 @@
> IGNORE=	Incorrect 'USES+= ninja:${ninja_ARGS}' ninja takes no arguments
> .endif
> 
>-.if defined(NINJA_VERBOSE)
> MAKE_ARGS+=	-v
>-.endif
> 
> BUILD_DEPENDS+=	ninja:devel/ninja
> 
>Index: Mk/bsd.port.mk
>===================================================================
>--- Mk/bsd.port.mk	(revision 421435)
>+++ Mk/bsd.port.mk	(working copy)
>@@ -2487,7 +2487,7 @@
> GNU_CONFIGURE_PREFIX?=	${PREFIX}
> GNU_CONFIGURE_MANPREFIX?=	${MANPREFIX}
> CONFIG_SITE?=		${PORTSDIR}/Templates/config.site
>-CONFIGURE_ARGS+=	--prefix=${GNU_CONFIGURE_PREFIX} $${_LATE_CONFIGURE_ARGS}
>+CONFIGURE_ARGS+=	--prefix=${GNU_CONFIGURE_PREFIX} --disable-silent-rules $${_LATE_CONFIGURE_ARGS}
> .if defined(X_BUILD_FOR)
> CONFIGURE_ARGS+=	--host=${X_BUILD_FOR}
> .endif
>Index: audio/speex/files/patch-configure
>===================================================================
>--- audio/speex/files/patch-configure	(nonexistent)
>+++ audio/speex/files/patch-configure	(working copy)
>@@ -0,0 +1,10 @@
>+--- configure.orig	2014-12-06 19:58:24 UTC
>++++ configure
>+@@ -2486,6 +2486,7 @@ case $enable_silent_rules in # (((
>+    no) AM_DEFAULT_VERBOSITY=1;;
>+     *) AM_DEFAULT_VERBOSITY=0;;
>+ esac
>++unset enableval
>+ am_make=${MAKE-make}
>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
>+ $as_echo_n "checking whether $am_make supports nested variables... " >&6; }
>
>Property changes on: audio/speex/files/patch-configure
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/libclc/Makefile
>===================================================================
>--- devel/libclc/Makefile	(revision 421435)
>+++ devel/libclc/Makefile	(working copy)
>@@ -15,7 +15,6 @@
> GH_ACCOUNT=	llvm-mirror
> GH_TAGNAME=	6d78407
> 
>-GNU_CONFIGURE=	yes
> USES=		gmake python:2,build ninja
> USE_LDCONFIG=	yes
> MAKE_ENV=	MAKE=${GMAKE} DESTDIR=${STAGEDIR}
>@@ -35,6 +34,7 @@
> do-configure:
> 	@cd ${WRKSRC} && ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS} -g ninja \
> 		--with-llvm-config=${LOCALBASE}/bin/llvm-config${LLVMVER} \
>-		--pkgconfigdir=${PREFIX}/libdata/pkgconfig
>+		--pkgconfigdir=${PREFIX}/libdata/pkgconfig \
>+		--prefix=${PREFIX}
> 
> .include <bsd.port.mk>

Actions: View | Diff

Attachments on bug 212075: 173968 | 174417 | 174427 | 174429 | 174431 | 174443 | 174446