svn commit: r357721 - in head/devel: boost-all boost-libs

[Bryan Drewery]

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} : <linkflags>-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" \