Attachment #244932 for bug #234971

Lines 83-89 CFLAGS+= -fdebug-prefix-map=${WRKSRC}=. Link Here

(-)b/Mk/bsd.ccache.mk (-1 / +1 lines)
83	# Avoid depends loops between ccache and pkg	83	# Avoid depends loops between ccache and pkg
84	. if !defined(NO_CCACHE_DEPEND) && \	84	. if !defined(NO_CCACHE_DEPEND) && \
85	${PKGORIGIN} != ${PKG_ORIGIN}	85	${PKGORIGIN} != ${PKG_ORIGIN}
86	BUILD_DEPENDS+= ${CCACHE_BIN}:devel/ccache	86	BUILD_DEPENDS+= ${CCACHE_BIN}:devel/${CCACHE_DEFAULT}
87	. endif	87	. endif
88		88
89	. if exists(${CCACHE_WRAPPER_PATH})	89	. if exists(${CCACHE_WRAPPER_PATH})

Lines 17-23 _INCLUDE_BSD_DEFAULT_VERSIONS_MK= yes Link Here

(-)b/Mk/bsd.default-versions.mk (-2 / +3 lines)
17		17
18	LOCALBASE?= /usr/local	18	LOCALBASE?= /usr/local
19		19
20	. for lang in APACHE BDB COROSYNC EBUR128 EMACS FIREBIRD FORTRAN FPC GCC \	20	. for lang in APACHE BDB CCACHE COROSYNC EBUR128 EMACS FIREBIRD FORTRAN FPC GCC \
21	GHOSTSCRIPT GL GO GUILE IMAGEMAGICK JAVA LAZARUS LIBRSVG2 LINUX LLVM \	21	GHOSTSCRIPT GL GO GUILE IMAGEMAGICK JAVA LAZARUS LIBRSVG2 LINUX LLVM \
22	LUA LUAJIT MONO MYSQL NINJA NODEJS OPENLDAP PERL5 PGSQL PHP \	22	LUA LUAJIT MONO MYSQL NINJA NODEJS OPENLDAP PERL5 PGSQL PHP \
23	PYCRYPTOGRAPHY PYTHON PYTHON2 PYTHON3 RUBY RUST SAMBA SSL TCLTK VARNISH	23	PYCRYPTOGRAPHY PYTHON PYTHON2 PYTHON3 RUBY RUST SAMBA SSL TCLTK VARNISH
Lines 36-41 ${_l:tu}_DEFAULT= ${lang:C/.*=//g} Link Here
36	APACHE_DEFAULT?= 2.4	36	APACHE_DEFAULT?= 2.4
37	# Possible values: 5, 18	37	# Possible values: 5, 18
38	BDB_DEFAULT?= 5	38	BDB_DEFAULT?= 5
		39	# Possible values: ccache ccache-memcached ccache-memcached-static ccache-static ccache4
		40	CCACHE_DEFAULT?= ccache
39	# Possible values: 2, 3	41	# Possible values: 2, 3
40	COROSYNC_DEFAULT?= 2	42	COROSYNC_DEFAULT?= 2
41	# Possible values: rust, legacy	43	# Possible values: rust, legacy
42	-

Return to bug 234971