Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 10 Oct 2019 20:04:11 +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: r514245 - head/graphics/rawtherapee
Message-ID:  <201910102004.x9AK4Bxq054505@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Thu Oct 10 20:04:11 2019
New Revision: 514245
URL: https://svnweb.freebsd.org/changeset/ports/514245

Log:
  - Respect NOCCACHE
  - Use proper path to CCACHE. It cannot be assumed to be in LOCALBASE
    as CCACHE_WRAPPER_PATH is used to override it.

Modified:
  head/graphics/rawtherapee/Makefile

Modified: head/graphics/rawtherapee/Makefile
==============================================================================
--- head/graphics/rawtherapee/Makefile	Thu Oct 10 19:51:10 2019	(r514244)
+++ head/graphics/rawtherapee/Makefile	Thu Oct 10 20:04:11 2019	(r514245)
@@ -73,9 +73,9 @@ INSTALLS_ICONS=	yes
 CMAKE_ARGS+=	-DPROC_TARGET_NUMBER="1"
 .endif
 
-.if "${WITH_CCACHE_BUILD}" == "yes" && !defined(NO_CCACHE) 
-CMAKE_ARGS+=	-DCMAKE_C_COMPILER_LAUNCHER=${LOCALBASE}/bin/ccache \
-		-DCMAKE_CXX_COMPILER_LAUNCHER=${LOCALBASE}/bin/ccache
+.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
 .endif
 
 RTDIR=		${PREFIX}/libdata/${PORTNAME}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910102004.x9AK4Bxq054505>