From owner-svn-ports-all@freebsd.org Thu Oct 10 20:06:25 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AA944130811; Thu, 10 Oct 2019 20:06:25 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46q2Cj443vz4WZQ; Thu, 10 Oct 2019 20:06:25 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6F8547166; Thu, 10 Oct 2019 20:06:25 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9AK6Pin054760; Thu, 10 Oct 2019 20:06:25 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9AK6Okr054756; Thu, 10 Oct 2019 20:06:24 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201910102006.x9AK6Okr054756@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 10 Oct 2019 20:06:24 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head: Mk graphics/rawtherapee lang/rust X-SVN-Commit-Revision: 514246 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Oct 2019 20:06:25 -0000 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