svn commit: r396051 - in head/devel/ccache: . files
Bryan Drewery
bdrewery at FreeBSD.org
Thu Sep 3 23:14:51 UTC 2015
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 <sys/param.h>
-+#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;
More information about the svn-ports-all
mailing list