From owner-svn-ports-head@freebsd.org Thu Sep 3 23:14:51 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 75F0F9CA84D; Thu, 3 Sep 2015 23:14:51 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6654A179C; Thu, 3 Sep 2015 23:14:51 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t83NEpeM010331; Thu, 3 Sep 2015 23:14:51 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t83NEoo2010329; Thu, 3 Sep 2015 23:14:50 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201509032314.t83NEoo2010329@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 3 Sep 2015 23:14:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396051 - 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.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2015 23:14:51 -0000 Author: bdrewery Date: Thu Sep 3 23:14:50 2015 New Revision: 396051 URL: https://svnweb.freebsd.org/changeset/ports/396051 Log: Always default CCACHE_CPP2 to 1, otherwise a build error with parenthesis can occur in buildworld when upgrading from a GCC-built clang or pre-10 system to a system built with clang. Modified: head/devel/ccache/Makefile head/devel/ccache/files/patch-conf.c Modified: head/devel/ccache/Makefile ============================================================================== --- head/devel/ccache/Makefile Thu Sep 3 22:23:09 2015 (r396050) +++ head/devel/ccache/Makefile Thu Sep 3 23:14:50 2015 (r396051) @@ -3,7 +3,7 @@ PORTNAME= ccache PORTVERSION= 3.2.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= http://www.samba.org/ftp/ccache/ \ LOCAL/bdrewery Modified: head/devel/ccache/files/patch-conf.c ============================================================================== --- head/devel/ccache/files/patch-conf.c Thu Sep 3 22:23:09 2015 (r396050) +++ head/devel/ccache/files/patch-conf.c Thu Sep 3 23:14:50 2015 (r396051) @@ -1,20 +1,10 @@ --- 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 -+#endif - - #include "conf.h" - #include "ccache.h" -@@ -321,7 +324,11 @@ conf_create(void) +@@ -321,7 +321,11 @@ conf_create(void) conf->read_only = false; conf->read_only_direct = false; conf->recache = false; -+#if __FreeBSD_version >= 1000024 || defined(CC_IS_CLANG) ++#if 1 + conf->run_second_cpp = true; +#else conf->run_second_cpp = false;