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

[Bryan Drewery]

Author: bdrewery
Date: Sat Jan 17 15:58:46 2015
New Revision: 377231
URL: https://svnweb.freebsd.org/changeset/ports/377231
QAT: https://qat.redports.org/buildarchive/r377231/

Log:
  Fix use with clang. CCACHE_CPP2 is still required. Otherwise the
  errors with parenthesis occur again.
  
  Seen with www/uwsgi.
  
  Reported by:	blackflow on freenode

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

Modified: head/devel/ccache/Makefile
==============================================================================
--- head/devel/ccache/Makefile	Sat Jan 17 15:58:01 2015	(r377230)
+++ head/devel/ccache/Makefile	Sat Jan 17 15:58:46 2015	(r377231)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ccache
 PORTVERSION=	3.2.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.samba.org/ftp/ccache/ \
 		LOCAL/bdrewery

Added: head/devel/ccache/files/patch-conf.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/ccache/files/patch-conf.c	Sat Jan 17 15:58:46 2015	(r377231)
@@ -0,0 +1,24 @@
+--- conf.c.orig	2015-01-16 16:26:23.872241677 -0600
++++ conf.c	2015-01-16 16:27:00.595237894 -0600
+@@ -15,6 +15,9 @@
+  * this program; if not, write to the Free Software Foundation, Inc., 51
+  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
++#if defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
+ 
+ #include "conf.h"
+ #include "ccache.h"
+@@ -321,7 +324,11 @@ conf_create(void)
+ 	conf->read_only = false;
+ 	conf->read_only_direct = false;
+ 	conf->recache = false;
++#if __FreeBSD_version >= 1000024 || defined(CC_IS_CLANG)
++	conf->run_second_cpp = true;
++#else
+ 	conf->run_second_cpp = false;
++#endif
+ 	conf->sloppiness = 0;
+ 	conf->stats = true;
+ 	conf->temporary_dir = x_strdup("");