From owner-svn-ports-head@FreeBSD.ORG  Wed May  8 20:06:49 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 08451304;
 Wed,  8 May 2013 20:06:49 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D66FDA00;
 Wed,  8 May 2013 20:06:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r48K6m84063093;
 Wed, 8 May 2013 20:06:48 GMT (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r48K6moY063091;
 Wed, 8 May 2013 20:06:48 GMT (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201305082006.r48K6moY063091@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Wed, 8 May 2013 20:06:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r317706 - in head/devel/ccache: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 May 2013 20:06:49 -0000

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) {