Index: head/devel/ccache/Makefile =================================================================== --- head/devel/ccache/Makefile (revision 399415) +++ head/devel/ccache/Makefile (revision 399416) @@ -1,98 +1,98 @@ # Created by: Dominic Marks # $FreeBSD$ PORTNAME= ccache -PORTVERSION= 3.2.3 +PORTVERSION= 3.2.4 PORTREVISION= 0 CATEGORIES= devel MASTER_SITES= http://www.samba.org/ftp/ccache/ \ LOCAL/bdrewery MAINTAINER= bdrewery@FreeBSD.org COMMENT= Tool to minimize the compile time of C/C++ programs LICENSE= GPLv3 GNU_CONFIGURE= yes HOWTO= ccache-howto-freebsd.txt CCLINKDIR= libexec/ccache SUB_FILES= ${HOWTO} world-ccache pkg-message ccache-update-links.sh PORTDOCS= ccache-howto-freebsd.txt MANUAL.html OPTIONS_DEFINE= CLANGLINK LLVMLINK STATIC DOCS TINDERBOX OPTIONS_DEFAULT=CLANGLINK LLVMLINK 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 USES= compiler # Don't allow autoreconf. We want no dependencies on this to keep # WITH_CCACHE_BUILD working. USES:= ${USES:Nautoreconf} OPTIONS_SUB= yes STATIC_LDFLAGS= -static .include . if ${COMPILER_TYPE} == clang CPPFLAGS+= -DCC_IS_CLANG . elif ${COMPILER_TYPE} == gcc CPPFLAGS+= -DCC_IS_GCC . endif PLIST_SUB+= CCLINKDIR="${CCLINKDIR}" .if ${ARCH}=="i386" CCACHE_COMPILERS+= icc icpc .endif GNU_COMPILERS+= 34 42 43 44 45 46 47 48 49 5 6 CCACHE_COMPILERS+= cc c++ CC gcc g++ ${GNU_COMPILERS:S|^|gcc|} ${GNU_COMPILERS:S|^|g++|} .if ${PORT_OPTIONS:MCLANGLINK} CLANG_COMPILERS+= 33 34 35 36 37 -devel CCACHE_COMPILERS+= clang clang++ ${CLANG_COMPILERS:S|^|clang|} ${CLANG_COMPILERS:S|^|clang++|} .endif .if ${PORT_OPTIONS:MLLVMLINK} CCACHE_COMPILERS+= llvm-gcc llvm-c++ llvm-g++ .endif CCACHE_COMPILERS+= ${EXTRA_COMPILERS} SUB_LIST+= CCACHE_COMPILERS="${CCACHE_COMPILERS}" \ CCLINKDIR="${CCLINKDIR}" \ ICCPREFIX="${LOCALBASE}/intel_cc_80/bin" \ HOWTO="${HOWTO}" post-build-TINDERBOX-on: @${MKDIR} ${WRKDIR}/tb/opt @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${WRKDIR}/tb/opt .for l in ${CCACHE_COMPILERS} @${LN} -sf ${PORTNAME} ${WRKDIR}/tb/opt/${l} .endfor @${TAR} -C ${WRKDIR}/tb -cpf ${WRKSRC}/${PORTNAME}.tar opt do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ccache ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/ccache.1 ${STAGEDIR}${PREFIX}/man/man1 ${MKDIR} ${STAGEDIR}${PREFIX}/${CCLINKDIR}/world ${INSTALL_SCRIPT} ${WRKDIR}/world-ccache \ ${STAGEDIR}${PREFIX}/${CCLINKDIR}/world/ccache ${INSTALL_SCRIPT} ${WRKDIR}/ccache-update-links.sh \ ${STAGEDIR}${PREFIX}/bin/ccache-update-links do-install-TINDERBOX-on: ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.tar ${STAGEDIR}${DATADIR} do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/MANUAL.html ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/${HOWTO} ${STAGEDIR}${DOCSDIR} .include Index: head/devel/ccache/distinfo =================================================================== --- head/devel/ccache/distinfo (revision 399415) +++ head/devel/ccache/distinfo (revision 399416) @@ -1,2 +1,2 @@ -SHA256 (ccache-3.2.3.tar.gz) = 43b2c0a0f7c8c89cecdc841b4ef55c626c9ca2bc80d5d746c91efcf81d224f6b -SIZE (ccache-3.2.3.tar.gz) = 438086 +SHA256 (ccache-3.2.4.tar.gz) = bf07d13e3c806971ea01af1d5a8db50319af434c920b4e4b742229aaa04d270c +SIZE (ccache-3.2.4.tar.gz) = 439320 Index: head/devel/ccache/files/patch-configure.ac =================================================================== --- head/devel/ccache/files/patch-configure.ac (revision 399415) +++ head/devel/ccache/files/patch-configure.ac (nonexistent) @@ -1,11 +0,0 @@ ---- configure.ac.orig 2015-08-16 12:12:05 UTC -+++ configure.ac -@@ -120,7 +120,7 @@ if test x${use_bundled_zlib} = xyes; the - extra_libs="zlib/libz.a" - mkdir -p zlib - else -- extra_libs="-lz" -+ LIBS="$LIBS -lz" - fi - - dnl Linking on Windows needs ws2_32 Property changes on: head/devel/ccache/files/patch-configure.ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/ccache/files/patch-configure =================================================================== --- head/devel/ccache/files/patch-configure (revision 399415) +++ head/devel/ccache/files/patch-configure (nonexistent) @@ -1,11 +0,0 @@ ---- configure.orig 2015-09-04 21:15:56 UTC -+++ configure -@@ -5682,7 +5682,7 @@ if test x${use_bundled_zlib} = xyes; the - extra_libs="zlib/libz.a" - mkdir -p zlib - else -- extra_libs="-lz" -+ LIBS="$LIBS -lz" - fi - - if test x${windows_os} = xyes; then Property changes on: head/devel/ccache/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/ccache/files/patch-ccache.c =================================================================== --- head/devel/ccache/files/patch-ccache.c (revision 399415) +++ head/devel/ccache/files/patch-ccache.c (revision 399416) @@ -1,28 +1,28 @@ Determine whether cc(1) is clang or gcc at compile-time. ---- 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) +--- ccache.c.orig 2015-10-15 15:01:14.756621000 -0700 ++++ ccache.c 2015-10-15 15:01:47.738326000 -0700 +@@ -1350,6 +1350,11 @@ compiler_is_clang(struct args *args) { - char* name = basename(args->argv[0]); - bool is = strstr(name, "clang"); + char *name = basename(args->argv[0]); + bool is = strstr(name, "clang") != NULL; +#ifdef CC_IS_CLANG + if (strcmp(name, "cc") == 0 || strcmp(name, "CC") == 0 || + strcmp(name, "c++") == 0) + is = true; +#endif free(name); return is; } -@@ -1125,6 +1130,11 @@ compiler_is_gcc(struct args *args) +@@ -1359,6 +1364,11 @@ compiler_is_gcc(struct args *args) { - char* name = basename(args->argv[0]); + 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 free(name); return is; }