Date: Mon, 3 Aug 2015 17:55:15 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393477 - head/science/meep Message-ID: <201508031755.t73HtF80030715@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Mon Aug 3 17:55:15 2015 New Revision: 393477 URL: https://svnweb.freebsd.org/changeset/ports/393477 Log: Fix build. Options helpers cannot be used here. Reported by: amdmi3 Modified: head/science/meep/Makefile Modified: head/science/meep/Makefile ============================================================================== --- head/science/meep/Makefile Mon Aug 3 17:11:22 2015 (r393476) +++ head/science/meep/Makefile Mon Aug 3 17:55:15 2015 (r393477) @@ -30,15 +30,6 @@ OPTIONS_RADIO_MPI= OPENMPI MPICH2 OPTIONS_DEFAULT= ${MPI_DEFAULT} OPENMPI_DESC= MPI support (with OpenMPI) -OPENMPI_BUILD_DEPENDS= ${LOCALBASE}/mpi/openmpi/bin/mpiCC:${PORTSDIR}/net/openmpi -OPENMPI_RUN_DEPENDS= ${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi -OPENMPI_CONFIGURE_ENV= MPICXX=${LOCALBASE}/mpi/openmpi/bin/mpiCC -OPENMPI_CFLAGS= -I${LOCALBASE}/mpi/openmpi/include - -MPICH2_LIB_DEPENDS= libmpich.so.8:${PORTSDIR}/net/mpich2 -MPICH2_CONFIGURE_ENV= MPICXX=${LOCALBASE}/bin/mpicc -MPICH2_CFLAGS= -I${LOCALBASE}/include - .include <bsd.port.pre.mk> .if ${OPSYS} == FreeBSD @@ -57,4 +48,17 @@ CONFIGURE_ARGS+= --without-mpi PLIST_SUB+= MPI="@comment " NOMPI="" .endif +.if ${PORT_OPTIONS:MMPICH2} +LIB_DEPENDS+= libmpich.so.8:${PORTSDIR}/net/mpich2 +CONFIGURE_ENV+= MPICXX=${LOCALBASE}/bin/mpicc +CFLAGS+= -I${LOCALBASE}/include +.endif + +.if ${PORT_OPTIONS:MOPENMPI} +BUILD_DEPENDS+= ${LOCALBASE}/mpi/openmpi/bin/mpiCC:${PORTSDIR}/net/openmpi +RUN_DEPENDS+= ${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi +CONFIGURE_ENV+= MPICXX=${LOCALBASE}/mpi/openmpi/bin/mpiCC +CFLAGS+= -I${LOCALBASE}/mpi/openmpi/include +.endif + .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508031755.t73HtF80030715>