svn commit: r316346 - in head/devel/ccache: . files

[Bryan Drewery]

Author: bdrewery
Date: Tue Apr 23 11:06:03 2013
New Revision: 316346
URL: http://svnweb.freebsd.org/changeset/ports/316346

Log:
  - Fix ccache for CURRENT world builds by automatically defining
    CCACHE_CPP2=1 when COMPILER_TYPE=clang (this will be removed
    once upstream fixes the issue). This does not address port
    builds yet.
  - Add more hints for building with clang
  - Split MASTER_SITES into 2 lines
  - Note that textproc/libexttextcat is an example port that currently
    fails to build with clang+ccache due to bug 8118 ('unused -I'). I
    plan to add the upstream patch to fix this after more testing.

Modified:
  head/devel/ccache/Makefile
  head/devel/ccache/files/pkg-message-clang
  head/devel/ccache/files/world-ccache.in

Modified: head/devel/ccache/Makefile
==============================================================================
--- head/devel/ccache/Makefile	Tue Apr 23 10:53:21 2013	(r316345)
+++ head/devel/ccache/Makefile	Tue Apr 23 11:06:03 2013	(r316346)
@@ -3,8 +3,10 @@
 
 PORTNAME=	ccache
 PORTVERSION=	3.1.9
+PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	http://www.samba.org/ftp/ccache/ CRITICAL
+MASTER_SITES=	http://www.samba.org/ftp/ccache/ \
+		CRITICAL
 
 MAINTAINER=	bdrewery at FreeBSD.org
 COMMENT=	Tool to minimize the compile time of C/C++ programs

Modified: head/devel/ccache/files/pkg-message-clang
==============================================================================
--- head/devel/ccache/files/pkg-message-clang	Tue Apr 23 10:53:21 2013	(r316345)
+++ head/devel/ccache/files/pkg-message-clang	Tue Apr 23 11:06:03 2013	(r316346)
@@ -2,6 +2,9 @@ You've chosen to create symlinks to the 
 While it's known to be safe to build world with clang/ccache, it is not fully
 supported yet. You have been warned.
 
+You should define CCACHE_CPP2=1 in your /etc/make.conf until bug 8460 is fixed.
+
 See:
-https://bugzilla.samba.org/show_bug.cgi?id=8460
+	https://bugzilla.samba.org/show_bug.cgi?id=8460
+	https://bugzilla.samba.org/show_bug.cgi?id=8118
 

Modified: head/devel/ccache/files/world-ccache.in
==============================================================================
--- head/devel/ccache/files/world-ccache.in	Tue Apr 23 10:53:21 2013	(r316345)
+++ head/devel/ccache/files/world-ccache.in	Tue Apr 23 11:06:03 2013	(r316346)
@@ -4,6 +4,8 @@
 printf "Please, use one of the compiler links in\n%%PREFIX%%/%%CCLINKDIR%%/world\nto invoke ccache\n" >&2 &&
 exit 1
 
+[ "${COMPILER_TYPE}" = "clang" ] && export CCACHE_CPP2=1
+
 unset CCACHE_PATH
 export CCACHE_COMPILERCHECK=content
 exec %%PREFIX%%/%%CCLINKDIR%%/${0##*/} "$@"