diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2013-04-23 11:06:03 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2013-04-23 11:06:03 +0000 |
| commit | 5ff378433875af1330c064d7d63fb79003427e83 (patch) | |
| tree | 3ac0905cc2ef0120dde2624d8553c6ff031a0dd7 | |
| parent | 36cad126ebd4467675af9f77b8c7da9b8e4cc107 (diff) | |
| download | ports-5ff378433875af1330c064d7d63fb79003427e83.tar.gz ports-5ff378433875af1330c064d7d63fb79003427e83.zip | |
- 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.
Notes
Notes:
svn path=/head/; revision=316346
| -rw-r--r-- | devel/ccache/Makefile | 4 | ||||
| -rw-r--r-- | devel/ccache/files/pkg-message-clang | 5 | ||||
| -rw-r--r-- | devel/ccache/files/world-ccache.in | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/devel/ccache/Makefile b/devel/ccache/Makefile index 5664840b4113..9a32537e34e6 100644 --- a/devel/ccache/Makefile +++ b/devel/ccache/Makefile @@ -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@FreeBSD.org COMMENT= Tool to minimize the compile time of C/C++ programs diff --git a/devel/ccache/files/pkg-message-clang b/devel/ccache/files/pkg-message-clang index b572ebfe3c97..eed5a090ca37 100644 --- a/devel/ccache/files/pkg-message-clang +++ b/devel/ccache/files/pkg-message-clang @@ -2,6 +2,9 @@ You've chosen to create symlinks to the clang compiler binaries if they exist. 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 diff --git a/devel/ccache/files/world-ccache.in b/devel/ccache/files/world-ccache.in index 2b27aeefeb3f..bdbc8893837f 100644 --- a/devel/ccache/files/world-ccache.in +++ b/devel/ccache/files/world-ccache.in @@ -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##*/} "$@" |