From 747450d39b6b754cd4ccce5ffddf3f6248f2e094 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Tue, 8 May 2018 19:14:50 +0000 Subject: [PATCH] MFH: r469300 r469389 Add clang60 support Update howto - 11.0+ base can just use WITH_CCACHE_BUILD=yes [1] - Remove older advise for libtool which is no longer needed - No need for clang unused argument hack anymore PR: 222765 [1] Submitted by: pete@nomadlogic.org [1] (based on) Approved by: portmgr (implicit) --- devel/ccache/Makefile | 4 ++-- devel/ccache/files/ccache-howto-freebsd.txt.in | 18 +++++++----------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/devel/ccache/Makefile b/devel/ccache/Makefile index 1450ff4bab90..261d5e7d424c 100644 --- a/devel/ccache/Makefile +++ b/devel/ccache/Makefile @@ -3,7 +3,7 @@ PORTNAME= ccache PORTVERSION= 3.3.5 -PORTREVISION= 0 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= https://www.samba.org/ftp/ccache/ \ LOCAL/bdrewery @@ -82,7 +82,7 @@ GNU_COMPILERS+= 34 42 43 44 45 46 47 48 49 5 6 7 8 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 38 39 40 50 -devel +CLANG_COMPILERS+= 33 34 35 36 37 38 39 40 50 60 -devel CCACHE_COMPILERS+= clang clang++ ${CLANG_COMPILERS:S|^|clang|} ${CLANG_COMPILERS:S|^|clang++|} .endif diff --git a/devel/ccache/files/ccache-howto-freebsd.txt.in b/devel/ccache/files/ccache-howto-freebsd.txt.in index bd4e185804e3..915254672288 100644 --- a/devel/ccache/files/ccache-howto-freebsd.txt.in +++ b/devel/ccache/files/ccache-howto-freebsd.txt.in @@ -6,7 +6,12 @@ To use ccache for ports, just add WITH_CCACHE_BUILD=yes to /etc/make.conf. The rest of this guide is for building /usr/src and other checkouts. -To use ccache for base add the following to /etc/make.conf. +To use ccache for base (11.0+) just add WITH_CCACHE_BUILD=yes +to /etc/src.conf. Refer to src.conf(5) for more information. + +------------------------------------------------------------------------------- + +For older releases, before 11.0, add the following to /etc/make.conf. You can replace cc and c++ with the compilers of your choice. (remember that only GCC and Clang can build world and kernel) @@ -28,7 +33,7 @@ For csh/tcsh Add the following to /etc/csh.cshrc: For icc users: Add %%ICCPREFIX%% to CCACHE_PATH --- +------------------------------------------------------------------------------- To use distcc: @@ -53,15 +58,6 @@ reset PATH=$CCACHE_PATH and try again. Make sure you run 'ccache-update-links' after you install/uninstall additional compilers in order to create/remove compiler links. -Clang will return a lot of 'unused argument' warnings: they are harmless. -Just add this to /etc/make.conf if you want to hide them: -.if ${CC:T} == "clang" -CFLAGS+= -Qunused-arguments -.endif - -Any time you change CC/CXX you need to reinstall devel/libtool or you -will run in to problems. - -- Ccache's default cache size is 1GB and this is larger than the default size of