diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-09-04 07:14:50 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-09-04 07:14:50 +0800 |
| commit | 40ddd2315a4cae5a013c5e1c7705b77233251c7e (patch) | |
| tree | 14315899c5969edb5c7ea661fc3095d3db03b7a2 /devel | |
| parent | 27a87ea0d26e92dccfc7007b1ed764016a9d25ca (diff) | |
| download | freebsd-ports-gnome-40ddd2315a4cae5a013c5e1c7705b77233251c7e.tar.gz freebsd-ports-gnome-40ddd2315a4cae5a013c5e1c7705b77233251c7e.tar.zst freebsd-ports-gnome-40ddd2315a4cae5a013c5e1c7705b77233251c7e.zip | |
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.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/ccache/Makefile | 2 | ||||
| -rw-r--r-- | devel/ccache/files/patch-conf.c | 14 |
2 files changed, 3 insertions, 13 deletions
diff --git a/devel/ccache/Makefile b/devel/ccache/Makefile index b5e941645f4d..6a158555b38a 100644 --- a/devel/ccache/Makefile +++ b/devel/ccache/Makefile @@ -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 diff --git a/devel/ccache/files/patch-conf.c b/devel/ccache/files/patch-conf.c index 5021fce33b76..2d950b7a5fa0 100644 --- a/devel/ccache/files/patch-conf.c +++ b/devel/ccache/files/patch-conf.c @@ -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; |