aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorahze <ahze@FreeBSD.org>2006-01-12 07:21:55 +0800
committerahze <ahze@FreeBSD.org>2006-01-12 07:21:55 +0800
commit42f5ed0e349ddde1493b1f0c6027812068357ca4 (patch)
treea471f0d9bbe1ab24543155223d327d999b387a00
parent9a514c736f75f48b75f505c665a5655e3e5a393f (diff)
downloadfreebsd-ports-gnome-42f5ed0e349ddde1493b1f0c6027812068357ca4.tar.gz
freebsd-ports-gnome-42f5ed0e349ddde1493b1f0c6027812068357ca4.tar.zst
freebsd-ports-gnome-42f5ed0e349ddde1493b1f0c6027812068357ca4.zip
- Fix example so it works better with make buildworld if you define NOCCACHE
with out installing ccache links in PREFIX/libexec/ccache/ - Add gcc42
-rw-r--r--devel/ccache/Makefile5
-rw-r--r--devel/ccache/files/ccache-howto-freebsd.txt.in2
2 files changed, 3 insertions, 4 deletions
diff --git a/devel/ccache/Makefile b/devel/ccache/Makefile
index deb0e500ac16..82012b7d3145 100644
--- a/devel/ccache/Makefile
+++ b/devel/ccache/Makefile
@@ -7,14 +7,13 @@
PORTNAME= ccache
PORTVERSION= 2.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= http://ccache.samba.org/ftp/ccache/
MAINTAINER= ahze@FreeBSD.org
COMMENT= A tool to minimize the compile time of C/C++ programs
-BROKEN= "Examples provided break buildworld"
GNU_CONFIGURE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -35,7 +34,7 @@ PLIST_DIRS= ${CCLINKDIR}
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_COMPILER_LINKS)
-GNU_COMPILERS= 295 32 33 34 35 40 41
+GNU_COMPILERS= 295 32 33 34 35 40 41 42
CCACHE_COMPILERS= cc c++ gcc g++ ${GNU_COMPILERS:S|^|gcc|} ${GNU_COMPILERS:S|^|g++|}
.if ${ARCH}=="i386"
CCACHE_COMPILERS+= icc icpc
diff --git a/devel/ccache/files/ccache-howto-freebsd.txt.in b/devel/ccache/files/ccache-howto-freebsd.txt.in
index 6f9f75f12475..ed0316e6f2a6 100644
--- a/devel/ccache/files/ccache-howto-freebsd.txt.in
+++ b/devel/ccache/files/ccache-howto-freebsd.txt.in
@@ -5,7 +5,7 @@
To use ccache add the following to /etc/make.conf
.if !defined(NOCCACHE)
-.if ${.CURDIR:M/usr/src*}
+.if ${.CURDIR:M/usr/src*} && exists(%%LOCALBASE%%/libexec/ccache/cc)
CC=%%LOCALBASE%%/libexec/ccache/cc
CXX=%%LOCALBASE%%/libexec/ccache/c++
.else