Date: Wed, 7 Jan 2015 00:57:05 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376448 - in head/devel/ccache: . files Message-ID: <201501070057.t070v54Q042167@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Wed Jan 7 00:57:04 2015 New Revision: 376448 URL: https://svnweb.freebsd.org/changeset/ports/376448 QAT: https://qat.redports.org/buildarchive/r376448/ Log: - Update to 3.2.1 This fixes some of the clang bugs. CCACHE_CPP2 should no longer be needed. - Remove COLORS option as it is now upstreamed and enabled by default. Requires DISABLE_MAKE_JOBS to see them (or no -j to make(1)) as bmake has a feature which disables colors with -j. Changes: https://ccache.samba.org/releasenotes.html#_ccache_3_2_1 Changes: https://ccache.samba.org/releasenotes.html#_ccache_3_2 Deleted: head/devel/ccache/files/extra-patch-colors Modified: head/devel/ccache/Makefile head/devel/ccache/distinfo head/devel/ccache/files/patch-ccache.c (contents, props changed) head/devel/ccache/files/pkg-message-clang head/devel/ccache/files/world-ccache.in Modified: head/devel/ccache/Makefile ============================================================================== --- head/devel/ccache/Makefile Wed Jan 7 00:25:46 2015 (r376447) +++ head/devel/ccache/Makefile Wed Jan 7 00:57:04 2015 (r376448) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= ccache -PORTVERSION= 3.1.10 -PORTREVISION= 1 +PORTVERSION= 3.2.1 +PORTREVISION= 0 CATEGORIES= devel MASTER_SITES= http://www.samba.org/ftp/ccache/ \ - LOCAL/ehaupt + LOCAL/bdrewery MAINTAINER= bdrewery@FreeBSD.org COMMENT= Tool to minimize the compile time of C/C++ programs @@ -21,31 +21,25 @@ SUB_FILES= ${HOWTO} world-ccache pkg-mes PORTDOCS= ccache-howto-freebsd.txt MANUAL.html -OPTIONS_DEFINE= CLANGLINK LLVMLINK STATIC DOCS TINDERBOX COLORS -OPTIONS_DEFAULT=COLORS +OPTIONS_DEFINE= CLANGLINK LLVMLINK STATIC DOCS TINDERBOX -COLORS_DESC= Support compiler colors CLANGLINK_DESC= Create clang compiler links if clang is installed LLVMLINK_DESC= Create llvm compiler links if llvm is installed TINDERBOX_DESC= Create tarball for tinderbox usage -COLORS_EXTRA_PATCHES= ${FILESDIR}/extra-patch-colors -COLORS_USES= compiler +USES= compiler OPTIONS_SUB= yes STATIC_LDFLAGS= -static .include <bsd.port.options.mk> -.include <bsd.port.pre.mk> -.if ${PORT_OPTIONS:MCOLORS} . if ${COMPILER_TYPE} == clang CPPFLAGS+= -DCC_IS_CLANG . elif ${COMPILER_TYPE} == gcc CPPFLAGS+= -DCC_IS_GCC . endif -.endif PLIST_SUB+= CCLINKDIR="${CCLINKDIR}" @@ -104,4 +98,4 @@ post-install: @${CAT} ${FILESDIR}/pkg-message-clang >> ${PKGMESSAGE} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/devel/ccache/distinfo ============================================================================== --- head/devel/ccache/distinfo Wed Jan 7 00:25:46 2015 (r376447) +++ head/devel/ccache/distinfo Wed Jan 7 00:57:04 2015 (r376448) @@ -1,2 +1,2 @@ -SHA256 (ccache-3.1.10.tar.gz) = ea37a21529c4d5c700d8dd1533c1d5f61e1e06e4c54c95ff30d5f1830b51fd3b -SIZE (ccache-3.1.10.tar.gz) = 354544 +SHA256 (ccache-3.2.1.tar.gz) = f8709a83daaeb9be22fe35c42e7862a8699b50de181ba3e28c89c092014ccb55 +SIZE (ccache-3.2.1.tar.gz) = 432423 Modified: head/devel/ccache/files/patch-ccache.c ============================================================================== --- head/devel/ccache/files/patch-ccache.c Wed Jan 7 00:25:46 2015 (r376447) +++ head/devel/ccache/files/patch-ccache.c Wed Jan 7 00:57:04 2015 (r376448) @@ -1,30 +1,28 @@ -$FreeBSD$ +Determine whether cc(1) is clang or gcc at compile-time. -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> +--- ccache.c.orig 2015-01-06 18:24:47.738295980 -0600 ++++ ccache.c 2015-01-06 18:25:58.685291460 -0600 +@@ -1116,6 +1116,11 @@ compiler_is_clang(struct args *args) + { + char* name = basename(args->argv[0]); + bool is = strstr(name, "clang"); ++#ifdef CC_IS_CLANG ++ if (strcmp(name, "cc") == 0 || strcmp(name, "CC") == 0 || ++ strcmp(name, "c++") == 0) ++ is = true; +#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"); + free(name); + return is; + } +@@ -1125,6 +1130,11 @@ compiler_is_gcc(struct args *args) + { + char* name = basename(args->argv[0]); + bool is = strstr(name, "gcc") || strstr(name, "g++"); ++#ifdef CC_IS_GCC ++ if (strcmp(name, "cc") == 0 || strcmp(name, "CC") == 0 || ++ strcmp(name, "c++") == 0) ++ is = true; +#endif - - /* make sure the cache dir exists */ - if (create_dir(cache_dir) != 0) { + free(name); + return is; + } Modified: head/devel/ccache/files/pkg-message-clang ============================================================================== --- head/devel/ccache/files/pkg-message-clang Wed Jan 7 00:25:46 2015 (r376447) +++ head/devel/ccache/files/pkg-message-clang Wed Jan 7 00:57:04 2015 (r376448) @@ -2,9 +2,5 @@ You've chosen to create symlinks to the While it's known to be safe to build world with clang/ccache, it is not fully supported yet. You have been warned. -You should define CCACHE_CPP2=1 in your /etc/make.conf until bug 8460 is fixed. - See: https://bugzilla.samba.org/show_bug.cgi?id=8460 - https://bugzilla.samba.org/show_bug.cgi?id=8118 - Modified: head/devel/ccache/files/world-ccache.in ============================================================================== --- head/devel/ccache/files/world-ccache.in Wed Jan 7 00:25:46 2015 (r376447) +++ head/devel/ccache/files/world-ccache.in Wed Jan 7 00:57:04 2015 (r376448) @@ -1,10 +1,8 @@ #!/bin/sh [ "${0##*/}" = "ccache" ] && -printf "Please, use one of the compiler links in\n%%PREFIX%%/%%CCLINKDIR%%/world\nto invoke ccache\n" >&2 && -exit 1 - -[ "${COMPILER_TYPE}" = "clang" ] && export CCACHE_CPP2=1 + printf "Please, use one of the compiler links in\n%%PREFIX%%/%%CCLINKDIR%%/world\nto invoke ccache\n" >&2 && + exit 1 unset CCACHE_PATH export CCACHE_COMPILERCHECK=content
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501070057.t070v54Q042167>