Date: Fri, 3 May 2019 12:30:41 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r500723 - head/science/ALPSCore Message-ID: <201905031230.x43CUfTq007452@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Fri May 3 12:30:40 2019 New Revision: 500723 URL: https://svnweb.freebsd.org/changeset/ports/500723 Log: compiler.mk is unhappy if CC/CXX is defined before bsd.port.pre.mk Reported by: Peter Jeremy Submitted by: mat Modified: head/science/ALPSCore/Makefile Modified: head/science/ALPSCore/Makefile ============================================================================== --- head/science/ALPSCore/Makefile Fri May 3 11:50:24 2019 (r500722) +++ head/science/ALPSCore/Makefile Fri May 3 12:30:40 2019 (r500723) @@ -38,11 +38,16 @@ DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen OPENMPI2_CMAKE_BOOL= ENABLE_MPI OPENMPI2_LIB_DEPENDS= libmpi.so:net/openmpi2 -OPENMPI2_VARS= cc=${LOCALBASE}/mpi/openmpi2/bin/mpicc \ - cxx=${LOCALBASE}/mpi/openmpi2/bin/mpicxx PORTDOCS= * +.include <bsd.port.pre.mk> + +.if ${PORT_OPTIONS:MOPENMP2} +CC= ${LOCALBASE}/mpi/openmpi2/bin/mpicc +CXX= ${LOCALBASE}/mpi/openmpi2/bin/mpicxx +.endif + post-install-DOXYGEN-on: @${RM} ${STAGEDIR}${DOCSDIR}/.tag @@ -51,4 +56,4 @@ pre-test: ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_ARGS_TEST} ${CMAKE_SOURCE_PATH} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -.include <bsd.port.mk> +.include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905031230.x43CUfTq007452>