From owner-svn-ports-all@FreeBSD.ORG Fri Jun 13 20:31:51 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2BB06452; Fri, 13 Jun 2014 20:31:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F2944239E; Fri, 13 Jun 2014 20:31:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5DKVoqT008914; Fri, 13 Jun 2014 20:31:50 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5DKVo7r008912; Fri, 13 Jun 2014 20:31:50 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201406132031.s5DKVo7r008912@svn.freebsd.org> From: Bryan Drewery Date: Fri, 13 Jun 2014 20:31:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357721 - in head/devel: boost-all boost-libs X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jun 2014 20:31:51 -0000 Author: bdrewery Date: Fri Jun 13 20:31:50 2014 New Revision: 357721 URL: http://svnweb.freebsd.org/changeset/ports/357721 QAT: https://qat.redports.org/buildarchive/r357721/ Log: - Fix build when using WITH_CCACHE_BUILD. ccache's documentation says to set CCACHE_SLOPPINESS=time_macros and CFLAGS+= -fpch-preprocess (it's a magic check in ccache for the string), but doing these does not actually fix the build when files are cached. Disabling PCH for ccache still results in an 18 second build, down from 143, on a 12 core machine. - While here, strip libraries with STRIP_CMD (not bumping rev as this is not significant enough to warrant a rebuild). Modified: head/devel/boost-all/compiled.mk head/devel/boost-libs/Makefile Modified: head/devel/boost-all/compiled.mk ============================================================================== --- head/devel/boost-all/compiled.mk Fri Jun 13 20:06:35 2014 (r357720) +++ head/devel/boost-all/compiled.mk Fri Jun 13 20:31:50 2014 (r357721) @@ -45,6 +45,11 @@ BJAM_ARGS+= optimization=speed BJAM_ARGS+= inlining=full .endif +# ccache build fails when using precompiled headers, on a cached build. +.if defined(WITH_CCACHE_BUILD) +BJAM_ARGS+= pch=off +.endif + post-patch: .if defined(USE_BINUTILS) @${ECHO} "using ${BOOST_TOOLSET} : : ${CXX} : -B${LOCALBASE}/bin ;" >> ${WRKSRC}/tools/build/v2/user-config.jam Modified: head/devel/boost-libs/Makefile ============================================================================== --- head/devel/boost-libs/Makefile Fri Jun 13 20:06:35 2014 (r357720) +++ head/devel/boost-libs/Makefile Fri Jun 13 20:31:50 2014 (r357721) @@ -17,8 +17,6 @@ ICU_DESC= Boost.Regex with ICU unicode .include "${.CURDIR}/../boost-all/compiled.mk" -NO_CCACHE= yes - BJAM_ARGS+= --without-python .if defined(X_BUILD_FOR) BJAM_ARGS+= --without-context --without-coroutine \ @@ -61,6 +59,8 @@ post-install: @${CAT} ${PKG_MESSAGE_FILE_THREADS} >> ${PKGMESSAGE} @${ECHO_CMD} >> ${PKGMESSAGE} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so + @${REINPLACE_CMD} \ -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ -e "s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|g" \