svn commit: r465145 - in head: devel/llvm-devel devel/llvm38 devel/llvm39 devel/llvm40 devel/llvm50 devel/llvm60 lang/ldc math/xtensor security/bro

[Bryan Drewery]

Author: bdrewery
Date: Wed Mar 21 03:45:55 2018
New Revision: 465145
URL: https://svnweb.freebsd.org/changeset/ports/465145

Log:
  Fix CCACHE_BUILD support.

Modified:
  head/devel/llvm-devel/Makefile
  head/devel/llvm38/Makefile
  head/devel/llvm39/Makefile
  head/devel/llvm40/Makefile
  head/devel/llvm50/Makefile
  head/devel/llvm60/Makefile
  head/lang/ldc/Makefile
  head/math/xtensor/Makefile
  head/security/bro/Makefile

Modified: head/devel/llvm-devel/Makefile
==============================================================================
--- head/devel/llvm-devel/Makefile	Wed Mar 21 01:33:36 2018	(r465144)
+++ head/devel/llvm-devel/Makefile	Wed Mar 21 03:45:55 2018	(r465145)
@@ -364,7 +364,7 @@ post-patch-CLANG-on:
 post-build-COMPILER_RT-on:
 	${MKDIR} ${WRKDIR}/compiler-rt-build
 	cd ${WRKDIR}/compiler-rt-build && \
-	${CMAKE_BIN} ${CMAKE_ARGS} \
+	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
 	    -DLLVM_CONFIG_PATH=${CONFIGURE_WRKSRC}/bin/llvm-config \
 	    ${WRKSRC_compiler_rt} && \
 	${MAKE_ENV} ${MAKE_CMD}

Modified: head/devel/llvm38/Makefile
==============================================================================
--- head/devel/llvm38/Makefile	Wed Mar 21 01:33:36 2018	(r465144)
+++ head/devel/llvm38/Makefile	Wed Mar 21 03:45:55 2018	(r465145)
@@ -313,7 +313,7 @@ post-patch-COMPILER_RT-on:
 post-build-COMPILER_RT-on:
 	${MKDIR} ${WRKDIR}/compiler-rt-build
 	cd ${WRKDIR}/compiler-rt-build && \
-	${CMAKE_BIN} ${CMAKE_ARGS} \
+	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
 	    -DLLVM_CONFIG_PATH=${CONFIGURE_WRKSRC}/bin/llvm-config \
 	    ${WRKSRC_compiler_rt} && \
 	${MAKE_ENV} ${MAKE_CMD}

Modified: head/devel/llvm39/Makefile
==============================================================================
--- head/devel/llvm39/Makefile	Wed Mar 21 01:33:36 2018	(r465144)
+++ head/devel/llvm39/Makefile	Wed Mar 21 03:45:55 2018	(r465145)
@@ -339,7 +339,7 @@ post-patch-COMPILER_RT-on:
 post-build-COMPILER_RT-on:
 	${MKDIR} ${WRKDIR}/compiler-rt-build
 	cd ${WRKDIR}/compiler-rt-build && \
-	${CMAKE_BIN} ${CMAKE_ARGS} \
+	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
 	    -DLLVM_CONFIG_PATH=${CONFIGURE_WRKSRC}/bin/llvm-config \
 	    ${WRKSRC_compiler_rt} && \
 	${MAKE_ENV} ${MAKE_CMD}

Modified: head/devel/llvm40/Makefile
==============================================================================
--- head/devel/llvm40/Makefile	Wed Mar 21 01:33:36 2018	(r465144)
+++ head/devel/llvm40/Makefile	Wed Mar 21 03:45:55 2018	(r465145)
@@ -373,7 +373,7 @@ post-patch-COMPILER_RT-on:
 post-build-COMPILER_RT-on:
 	${MKDIR} ${WRKDIR}/compiler-rt-build
 	cd ${WRKDIR}/compiler-rt-build && \
-	${CMAKE_BIN} ${CMAKE_ARGS} \
+	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
 	    -DLLVM_CONFIG_PATH=${CONFIGURE_WRKSRC}/bin/llvm-config \
 	    ${WRKSRC_compiler_rt} && \
 	${MAKE_ENV} ${MAKE_CMD}

Modified: head/devel/llvm50/Makefile
==============================================================================
--- head/devel/llvm50/Makefile	Wed Mar 21 01:33:36 2018	(r465144)
+++ head/devel/llvm50/Makefile	Wed Mar 21 03:45:55 2018	(r465145)
@@ -384,7 +384,7 @@ post-patch-CLANG-on:
 post-build-COMPILER_RT-on:
 	${MKDIR} ${WRKDIR}/compiler-rt-build
 	cd ${WRKDIR}/compiler-rt-build && \
-	${CMAKE_BIN} ${CMAKE_ARGS} \
+	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
 	    -DLLVM_CONFIG_PATH=${CONFIGURE_WRKSRC}/bin/llvm-config \
 	    ${WRKSRC_compiler_rt} && \
 	${MAKE_ENV} ${MAKE_CMD}

Modified: head/devel/llvm60/Makefile
==============================================================================
--- head/devel/llvm60/Makefile	Wed Mar 21 01:33:36 2018	(r465144)
+++ head/devel/llvm60/Makefile	Wed Mar 21 03:45:55 2018	(r465145)
@@ -393,7 +393,7 @@ post-patch-CLANG-on:
 post-build-COMPILER_RT-on:
 	${MKDIR} ${WRKDIR}/compiler-rt-build
 	cd ${WRKDIR}/compiler-rt-build && \
-	${CMAKE_BIN} ${CMAKE_ARGS} \
+	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
 	    -DLLVM_CONFIG_PATH=${CONFIGURE_WRKSRC}/bin/llvm-config \
 	    ${WRKSRC_compiler_rt} && \
 	    ${MAKE_ENV} ${MAKE_CMD}

Modified: head/lang/ldc/Makefile
==============================================================================
--- head/lang/ldc/Makefile	Wed Mar 21 01:33:36 2018	(r465144)
+++ head/lang/ldc/Makefile	Wed Mar 21 03:45:55 2018	(r465145)
@@ -49,7 +49,9 @@ post-patch:
 		${WRKSRC}/cmake/Modules/FindLLVM.cmake
 
 pre-configure:
-	@cd ${WRKDIR}/${PORTNAME}-${BOOTVER:S/$/-src/} && ${CMAKE_BIN} .
-	@cd ${WRKDIR}/${PORTNAME}-${BOOTVER:S/$/-src/} && ${MAKE}
+	@cd ${WRKDIR}/${PORTNAME}-${BOOTVER:S/$/-src/} && \
+	    ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} .
+	@cd ${WRKDIR}/${PORTNAME}-${BOOTVER:S/$/-src/} && \
+	    ${SETENV} ${MAKE_ENV} ${MAKE}
 
 .include <bsd.port.post.mk>

Modified: head/math/xtensor/Makefile
==============================================================================
--- head/math/xtensor/Makefile	Wed Mar 21 01:33:36 2018	(r465144)
+++ head/math/xtensor/Makefile	Wed Mar 21 03:45:55 2018	(r465145)
@@ -25,7 +25,7 @@ post-install:
 do-test:
 	@${RLN} ${STAGEDIR}${PREFIX}/include ${WRKSRC}/test/staged-include
 	@cd ${WRKSRC}/test && \
-		${CMAKE_BIN} ${CMAKE_ARGS} . && \
+		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} . && \
 		${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} && \
 		${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} xtest
 

Modified: head/security/bro/Makefile
==============================================================================
--- head/security/bro/Makefile	Wed Mar 21 01:33:36 2018	(r465144)
+++ head/security/bro/Makefile	Wed Mar 21 03:45:55 2018	(r465145)
@@ -113,9 +113,11 @@ INSTALL_WRKSRC2=	${CONFIGURE_WRKSRC2}
 pre-configure-BROKER-on:
 	${MKDIR} ${CONFIGURE_WRKSRC2}
 	(cd ${CONFIGURE_WRKSRC2} && \
+	    ${SETENV} ${CONFIGURE_ENV} \
 	    ${CMAKE_BIN} ${CMAKE_ARGS2} ${WRKSRC_actor_framework})
 	${MKDIR} ${STAGEDIR2}
 	(cd ${BUILD_WRKSRC2} && \
+	    ${SETENV} ${MAKE_ENV:NDESTDIR=*} \
 	    ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} install)
 	${LN} -s libcaf_core_static.a ${STAGEDIR2}${PREFIX}/lib/libcaf_core.a
 	${LN} -s libcaf_io_static.a ${STAGEDIR2}${PREFIX}/lib/libcaf_io.a