Date: Thu, 10 Oct 2019 20:09:59 +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: r514247 - in head: Mk audio/tuxguitar graphics/rawtherapee lang/rust net/mpich2 Message-ID: <201910102009.x9AK9xur055103@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu Oct 10 20:09:59 2019 New Revision: 514247 URL: https://svnweb.freebsd.org/changeset/ports/514247 Log: - Add compat for NOCCACHE -> NO_CCACHE Modified: head/Mk/bsd.ccache.mk head/audio/tuxguitar/Makefile head/graphics/rawtherapee/Makefile head/lang/rust/Makefile head/net/mpich2/Makefile Modified: head/Mk/bsd.ccache.mk ============================================================================== --- head/Mk/bsd.ccache.mk Thu Oct 10 20:06:24 2019 (r514246) +++ head/Mk/bsd.ccache.mk Thu Oct 10 20:09:59 2019 (r514247) @@ -12,6 +12,10 @@ COMMANDS_Include_MAINTAINER= portmgr@FreeBSD.org _CCACHEMKINCLUDED= yes +.if defined(NOCCACHE) +NO_CCACHE= t +.endif + # HOME is always set to ${WRKDIR} now. Try to use /root/.ccache as default. .if defined(WITH_CCACHE_BUILD) && !defined(CCACHE_DIR) . if defined(USER) && ${USER} == root @@ -25,7 +29,7 @@ WARNING+= WITH_CCACHE_BUILD support disabled, please s # Support NO_CCACHE for common setups, require WITH_CCACHE_BUILD, and # don't use if ccache already set in CC .if !defined(NO_CCACHE) && defined(WITH_CCACHE_BUILD) && !${CC:M*ccache*} && \ - !defined(NO_BUILD) && !defined(NOCCACHE) + !defined(NO_BUILD) # Avoid depends loops between ccache and pkg . if !defined(NO_CCACHE_DEPEND) && \ Modified: head/audio/tuxguitar/Makefile ============================================================================== --- head/audio/tuxguitar/Makefile Thu Oct 10 20:06:24 2019 (r514246) +++ head/audio/tuxguitar/Makefile Thu Oct 10 20:09:59 2019 (r514247) @@ -36,7 +36,7 @@ USE_JAVA= yes USE_ANT= yes USE_LDCONFIG= yes JAVA_VERSION= 1.6+ -NOCCACHE= yes +NO_CCACHE= yes BUILD_WRKSRC= ${WRKSRC}/TuxGuitar SF2_DIR= ${LOCALBASE}/share/sounds/sf2 Modified: head/graphics/rawtherapee/Makefile ============================================================================== --- head/graphics/rawtherapee/Makefile Thu Oct 10 20:06:24 2019 (r514246) +++ head/graphics/rawtherapee/Makefile Thu Oct 10 20:09:59 2019 (r514247) @@ -73,7 +73,7 @@ INSTALLS_ICONS= yes CMAKE_ARGS+= -DPROC_TARGET_NUMBER="1" .endif -.if "${WITH_CCACHE_BUILD}" == "yes" && !defined(NO_CCACHE) && !defined(NOCCACHE) +.if "${WITH_CCACHE_BUILD}" == "yes" && !defined(NO_CCACHE) CMAKE_ARGS+= -DCMAKE_C_COMPILER_LAUNCHER=${CCACHE_BIN} \ -DCMAKE_CXX_COMPILER_LAUNCHER=${CCACHE_BIN} .endif Modified: head/lang/rust/Makefile ============================================================================== --- head/lang/rust/Makefile Thu Oct 10 20:06:24 2019 (r514246) +++ head/lang/rust/Makefile Thu Oct 10 20:09:59 2019 (r514247) @@ -140,7 +140,7 @@ post-patch-SOURCES-off: @${REINPLACE_CMD} -e 's/config.tools.*"src".*/false;/' \ ${WRKSRC}/src/bootstrap/install.rs -.if defined(WITH_CCACHE_BUILD) && !defined(NO_CCACHE) && !defined(NOCCACHE) +.if defined(WITH_CCACHE_BUILD) && !defined(NO_CCACHE) CCACHE_VALUE= "${CCACHE_BIN}" .else CCACHE_VALUE= false Modified: head/net/mpich2/Makefile ============================================================================== --- head/net/mpich2/Makefile Thu Oct 10 20:06:24 2019 (r514246) +++ head/net/mpich2/Makefile Thu Oct 10 20:09:59 2019 (r514247) @@ -53,7 +53,7 @@ FFLAGS= -O2 LDFLAGS+= -lpthread -lexecinfo MAKE_ENV= CCACHE_DISABLE=yes PACKAGE=${PORTNAME} -NOCCACHE= yes +NO_CCACHE= yes CONFLICTS= lam-7.* mpd-[0-9]* mpiexec-0.*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910102009.x9AK9xur055103>