mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-20 00:21:35 +00:00
Code Issues Releases Activity

net/openmpi and net/openmpi3: Fix build with GCC 10 and remove deprecated option.

Browse Source 
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
This commit is contained in:
Danilo Egea Gondolfo 2020-10-16 11:25:29 +00:00
parent a9b553dae1
commit 22d77e41e7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=552500
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/openmpi/Makefile
View File

@ -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 \
@ -95,6 +94,12 @@ SLURM_PLIST_FILES= ${MPIDIR}/lib/openmpi/mca_ess_slurm.la \
${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' \
${WRKSRC}/ompi/tools/wrappers/Makefile.am \

7
net/openmpi3/Makefile
View File

@ -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 \
@ -93,6 +92,12 @@ SLURM_PLIST_FILES= ${MPIDIR}/lib/openmpi/mca_ess_slurm.la \
${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' \
${WRKSRC}/ompi/tools/wrappers/Makefile.am \