svn commit: r552500 - in head/net: openmpi openmpi3

[Danilo Egea Gondolfo]

Author: danilo
Date: Fri Oct 16 11:25:29 2020
New Revision: 552500
URL: https://svnweb.freebsd.org/changeset/ports/552500

Log:
  net/openmpi and net/openmpi3: Fix build with GCC 10 and remove deprecated option.
  
  Some gfortran defaults were changed in GCC 10: https://gcc.gnu.org/gcc-10/changes.html
  The conditional is required because the parameter -fallow-argument-mismatch will break the current default gfortran.
  
  Reported by:	linimon

Modified:
  head/net/openmpi/Makefile
  head/net/openmpi3/Makefile

Modified: head/net/openmpi/Makefile
==============================================================================
--- head/net/openmpi/Makefile	Fri Oct 16 10:59:10 2020	(r552499)
+++ head/net/openmpi/Makefile	Fri Oct 16 11:25:29 2020	(r552500)
@@ -44,7 +44,6 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX}/${MPIDIR} \
 			--enable-mpi-fortran=usempi \
 			--enable-mpi-cxx \
 			--enable-cxx-exceptions \
-			--enable-mpi-thread-multiple \
 			--with-libevent=external \
 			--enable-mca-no-build=verbs,btl_openib,oob_ud \
 			--without-verbs \
@@ -94,6 +93,12 @@ SLURM_PLIST_FILES=	${MPIDIR}/lib/openmpi/mca_ess_slurm
 			${MPIDIR}/lib/openmpi/mca_schizo_slurm.so \
 			${MPIDIR}/share/openmpi/help-plm-slurm.txt \
 			${MPIDIR}/share/openmpi/help-ras-slurm.txt
+
+.include <bsd.port.options.mk>
+
+.if ${FORTRAN_DEFAULT} == gfortran && ${GCC_DEFAULT} >= 10
+FCFLAGS+=	-fallow-argument-mismatch
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${LOCALBASE}/libdata/pkgconfig|g' \

Modified: head/net/openmpi3/Makefile
==============================================================================
--- head/net/openmpi3/Makefile	Fri Oct 16 10:59:10 2020	(r552499)
+++ head/net/openmpi3/Makefile	Fri Oct 16 11:25:29 2020	(r552500)
@@ -43,7 +43,6 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX}/${MPIDIR} \
 			--enable-mpi-fortran=usempi \
 			--enable-mpi-cxx \
 			--enable-cxx-exceptions \
-			--enable-mpi-thread-multiple \
 			--with-libevent=external \
 			--enable-mca-no-build=verbs,btl_openib,oob_ud \
 			--without-verbs \
@@ -92,6 +91,12 @@ SLURM_PLIST_FILES=	${MPIDIR}/lib/openmpi/mca_ess_slurm
 			${MPIDIR}/lib/openmpi/mca_schizo_slurm.so \
 			${MPIDIR}/share/openmpi/help-plm-slurm.txt \
 			${MPIDIR}/share/openmpi/help-ras-slurm.txt
+
+.include <bsd.port.options.mk>
+
+.if ${FORTRAN_DEFAULT} == gfortran && ${GCC_DEFAULT} >= 10
+FCFLAGS+=	-fallow-argument-mismatch
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/${MPIDIR}/libdata/pkgconfig|g' \