Date: Thu, 10 Oct 2019 20:06:24 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r514246 - in head: Mk graphics/rawtherapee lang/rust Message-ID: <201910102006.x9AK6Okr054756@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu Oct 10 20:06:24 2019 New Revision: 514246 URL: https://svnweb.freebsd.org/changeset/ports/514246 Log: - Add a CCACHE_BIN variable for simplified use where needed. Modified: head/Mk/bsd.ccache.mk head/graphics/rawtherapee/Makefile head/lang/rust/Makefile Modified: head/Mk/bsd.ccache.mk ============================================================================== --- head/Mk/bsd.ccache.mk Thu Oct 10 20:04:11 2019 (r514245) +++ head/Mk/bsd.ccache.mk Thu Oct 10 20:06:24 2019 (r514246) @@ -34,6 +34,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/ccache:devel/ccache . endif CCACHE_WRAPPER_PATH?= ${LOCALBASE}/libexec/ccache +CCACHE_BIN?= ${CCACHE_WRAPPER_PATH:C,/libexec/ccache$,,}/bin/ccache .if exists(${CCACHE_WRAPPER_PATH}) # Prepend the ccache dir into the PATH and setup ccache env Modified: head/graphics/rawtherapee/Makefile ============================================================================== --- head/graphics/rawtherapee/Makefile Thu Oct 10 20:04:11 2019 (r514245) +++ head/graphics/rawtherapee/Makefile Thu Oct 10 20:06:24 2019 (r514246) @@ -74,8 +74,8 @@ CMAKE_ARGS+= -DPROC_TARGET_NUMBER="1" .endif .if "${WITH_CCACHE_BUILD}" == "yes" && !defined(NO_CCACHE) && !defined(NOCCACHE) -CMAKE_ARGS+= -DCMAKE_C_COMPILER_LAUNCHER=${CCACHE_WRAPPER_PATH:C,/libexec/ccache$,,}/bin/ccache \ - -DCMAKE_CXX_COMPILER_LAUNCHER=${CCACHE_WRAPPER_PATH:C,/libexec/ccache$,,}/bin/ccache +CMAKE_ARGS+= -DCMAKE_C_COMPILER_LAUNCHER=${CCACHE_BIN} \ + -DCMAKE_CXX_COMPILER_LAUNCHER=${CCACHE_BIN} .endif RTDIR= ${PREFIX}/libdata/${PORTNAME} Modified: head/lang/rust/Makefile ============================================================================== --- head/lang/rust/Makefile Thu Oct 10 20:04:11 2019 (r514245) +++ head/lang/rust/Makefile Thu Oct 10 20:06:24 2019 (r514246) @@ -141,7 +141,7 @@ post-patch-SOURCES-off: ${WRKSRC}/src/bootstrap/install.rs .if defined(WITH_CCACHE_BUILD) && !defined(NO_CCACHE) && !defined(NOCCACHE) -CCACHE_VALUE= "${CCACHE_WRAPPER_PATH:C,/libexec/ccache$,,}/bin/ccache" +CCACHE_VALUE= "${CCACHE_BIN}" .else CCACHE_VALUE= false .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910102006.x9AK6Okr054756>