diff options
| -rw-r--r-- | devel/llvm-devel/Makefile | 2 | ||||
| -rw-r--r-- | devel/llvm38/Makefile | 2 | ||||
| -rw-r--r-- | devel/llvm39/Makefile | 2 | ||||
| -rw-r--r-- | devel/llvm40/Makefile | 2 | ||||
| -rw-r--r-- | devel/llvm50/Makefile | 2 | ||||
| -rw-r--r-- | devel/llvm60/Makefile | 2 | ||||
| -rw-r--r-- | lang/ldc/Makefile | 6 | ||||
| -rw-r--r-- | math/xtensor/Makefile | 2 | ||||
| -rw-r--r-- | security/bro/Makefile | 2 |
9 files changed, 13 insertions, 9 deletions
diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index 4d59088b4c2c..9e65bdb2f932 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -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} diff --git a/devel/llvm38/Makefile b/devel/llvm38/Makefile index 7af8c7ac6e99..a10874b1bd1a 100644 --- a/devel/llvm38/Makefile +++ b/devel/llvm38/Makefile @@ -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} diff --git a/devel/llvm39/Makefile b/devel/llvm39/Makefile index 3d01faa6e348..6f10d86477f2 100644 --- a/devel/llvm39/Makefile +++ b/devel/llvm39/Makefile @@ -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} diff --git a/devel/llvm40/Makefile b/devel/llvm40/Makefile index fd61c41b730c..56c725b5c3ab 100644 --- a/devel/llvm40/Makefile +++ b/devel/llvm40/Makefile @@ -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} diff --git a/devel/llvm50/Makefile b/devel/llvm50/Makefile index b43e82c29343..a2e7a30eb89c 100644 --- a/devel/llvm50/Makefile +++ b/devel/llvm50/Makefile @@ -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} diff --git a/devel/llvm60/Makefile b/devel/llvm60/Makefile index 59c59514f076..201251cea19a 100644 --- a/devel/llvm60/Makefile +++ b/devel/llvm60/Makefile @@ -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} diff --git a/lang/ldc/Makefile b/lang/ldc/Makefile index 68f4ec14507d..41ab00740b3e 100644 --- a/lang/ldc/Makefile +++ b/lang/ldc/Makefile @@ -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> diff --git a/math/xtensor/Makefile b/math/xtensor/Makefile index 2c51001a9710..1d18bb034806 100644 --- a/math/xtensor/Makefile +++ b/math/xtensor/Makefile @@ -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 diff --git a/security/bro/Makefile b/security/bro/Makefile index 0c3c26c92ea9..d4056483c7a1 100644 --- a/security/bro/Makefile +++ b/security/bro/Makefile @@ -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 |