Sat Jun 17 02:47:20 2017 UTC ()
Correct ccache(1) typo: CPPATH -> CPPPATH


(kamil)
diff -r1.36 -r1.37 pkgsrc/mk/compiler/ccache.mk
cvs diff -r1.36 -r1.37 pkgsrc/mk/compiler/ccache.mk (expand / switch to unified diff)

--- pkgsrc/mk/compiler/ccache.mk 2017/06/17 01:44:54 1.36
+++ pkgsrc/mk/compiler/ccache.mk 2017/06/17 02:47:20 1.37
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: ccache.mk,v 1.36 2017/06/17 01:44:54 kamil Exp $ 1# $NetBSD: ccache.mk,v 1.37 2017/06/17 02:47:20 kamil Exp $
2# 2#
3# Copyright (c) 2004 The NetBSD Foundation, Inc. 3# Copyright (c) 2004 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# This code is derived from software contributed to The NetBSD Foundation 6# This code is derived from software contributed to The NetBSD Foundation
7# by Johnny C. Lam. 7# by Johnny C. Lam.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 1. Redistributions of source code must retain the above copyright 12# 1. Redistributions of source code must retain the above copyright
13# notice, this list of conditions and the following disclaimer. 13# notice, this list of conditions and the following disclaimer.
14# 2. Redistributions in binary form must reproduce the above copyright 14# 2. Redistributions in binary form must reproduce the above copyright
@@ -135,27 +135,27 @@ PKG_CXX:= ${_CCACHE_CXX} @@ -135,27 +135,27 @@ PKG_CXX:= ${_CCACHE_CXX}
135 135
136PREPEND_PATH+= ${_CCACHE_DIR}/bin 136PREPEND_PATH+= ${_CCACHE_DIR}/bin
137 137
138# Add the dependency on ccache. 138# Add the dependency on ccache.
139. if ${CCACHE_BASE} == ${LOCALBASE} 139. if ${CCACHE_BASE} == ${LOCALBASE}
140TOOL_DEPENDS+= ccache-[0-9]*:../../devel/ccache 140TOOL_DEPENDS+= ccache-[0-9]*:../../devel/ccache
141. endif 141. endif
142 142
143# Override the compiler-specific hash with the version string for the 143# Override the compiler-specific hash with the version string for the
144# compiler. 144# compiler.
145# 145#
146PKGSRC_MAKE_ENV+= CCACHE_COMPILERCHECK=echo\ ${CC_VERSION_STRING:Q} 146PKGSRC_MAKE_ENV+= CCACHE_COMPILERCHECK=echo\ ${CC_VERSION_STRING:Q}
147PKGSRC_MAKE_ENV+= CCACHE_DIR=${CCACHE_DIR:Q} 147PKGSRC_MAKE_ENV+= CCACHE_DIR=${CCACHE_DIR:Q}
148PKGSRC_MAKE_ENV+= CCACHE_PATH=${CCPATH:H}:${CXXPATH:H}:${CPPATH:H} 148PKGSRC_MAKE_ENV+= CCACHE_PATH=${CCPATH:H}:${CXXPATH:H}:${CPPPATH:H}
149.ifdef CCACHE_LOGFILE 149.ifdef CCACHE_LOGFILE
150PKGSRC_MAKE_ENV+= CCACHE_LOGFILE=${CCACHE_LOGFILE:Q} 150PKGSRC_MAKE_ENV+= CCACHE_LOGFILE=${CCACHE_LOGFILE:Q}
151.endif 151.endif
152 152
153# Create symlinks for the compiler into ${WRKDIR}. 153# Create symlinks for the compiler into ${WRKDIR}.
154. for _var_ in ${_CCACHE_VARS} 154. for _var_ in ${_CCACHE_VARS}
155. if !target(${_CCACHE_${_var_}}) 155. if !target(${_CCACHE_${_var_}})
156override-tools: ${_CCACHE_${_var_}} 156override-tools: ${_CCACHE_${_var_}}
157${_CCACHE_${_var_}}: 157${_CCACHE_${_var_}}:
158 ${RUN}${MKDIR} ${.TARGET:H} 158 ${RUN}${MKDIR} ${.TARGET:H}
159 ${RUN} \ 159 ${RUN} \
160 ${LN} -fs ${CCACHE_BASE}/bin/ccache ${.TARGET} 160 ${LN} -fs ${CCACHE_BASE}/bin/ccache ${.TARGET}
161. for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//} 161. for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}