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

[Bryan Drewery]

Author: bdrewery
Date: Wed May  8 20:06:48 2013
New Revision: 317706
URL: http://svnweb.freebsd.org/changeset/ports/317706

Log:
  - Always enable CCACHE_CPP2 on CURRENT after clang became the default.
    This fixes building ports with ccache+clang without needing CCACHE_CPP2
    set in make.conf. This fix will be removed once upstream ccache has a
    working fix for this.
    Note that this does not fix the issue if building on non-CURRENT with
    CC=clang

Added:
  head/devel/ccache/files/patch-ccache.c   (contents, props changed)
Modified:
  head/devel/ccache/Makefile

Modified: head/devel/ccache/Makefile
==============================================================================
--- head/devel/ccache/Makefile	Wed May  8 18:47:47 2013	(r317705)
+++ head/devel/ccache/Makefile	Wed May  8 20:06:48 2013	(r317706)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ccache
 PORTVERSION=	3.1.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.samba.org/ftp/ccache/ \
 		CRITICAL

Added: head/devel/ccache/files/patch-ccache.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/ccache/files/patch-ccache.c	Wed May  8 20:06:48 2013	(r317706)
@@ -0,0 +1,30 @@
+$FreeBSD$
+
+Disable compiling preprocessed code on CURRENT with default clang. Avoids
+needing to define CCACHE_CPP2 to build with clang. Performance hit but
+much safer until upstream fixes the build issue.
+
+--- ./ccache.c.orig	2013-05-08 14:22:16.891630019 -0500
++++ ./ccache.c	2013-05-08 14:27:18.488628070 -0500
+@@ -31,6 +31,9 @@
+ #include "hashutil.h"
+ #include "language.h"
+ #include "manifest.h"
++#if defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
+ 
+ static const char VERSION_TEXT[] =
+ MYNAME " version %s\n"
+@@ -2260,7 +2263,11 @@
+ 		base_dir = NULL;
+ 	}
+ 
++#if __FreeBSD_version >= 1000024
++	compile_preprocessed_source_code = false;
++#else
+ 	compile_preprocessed_source_code = !getenv("CCACHE_CPP2");
++#endif
+ 
+ 	/* make sure the cache dir exists */
+ 	if (create_dir(cache_dir) != 0) {