Date: Tue, 1 Nov 2022 18:54:50 GMT From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0e482f8871e4 - main - Mk/Uses/fortran.mk: revert fa6fe3f8b6d7 Message-ID: <202211011854.2A1IsoUq084646@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=0e482f8871e46afd57589f87197a8a533e1aa3fc commit 0e482f8871e46afd57589f87197a8a533e1aa3fc Author: Thierry Thomas <thierry@FreeBSD.org> AuthorDate: 2022-11-01 18:50:00 +0000 Commit: Thierry Thomas <thierry@FreeBSD.org> CommitDate: 2022-11-01 18:54:47 +0000 Mk/Uses/fortran.mk: revert fa6fe3f8b6d7 For some reason, net/mpich does not accept FC with F90. It should be possible to fix it, but I’m afraid that other ports could be affected too, so it seems better to revert for the moment. PR: 267502 Reported by: jfc (at) mit.edu --- Mk/Uses/fortran.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Mk/Uses/fortran.mk b/Mk/Uses/fortran.mk index 4bd092113ff8..4bf4d38d0799 100644 --- a/Mk/Uses/fortran.mk +++ b/Mk/Uses/fortran.mk @@ -18,7 +18,6 @@ _GCC_VER= ${GCC_DEFAULT:S/.//} BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER} RUN_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER} F77= gfortran${_GCC_VER} -F90= gfortran${_GCC_VER} FC= gfortran${_GCC_VER} FFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} FCFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} @@ -29,7 +28,7 @@ IGNORE= USES=fortran: invalid arguments: ${fortran_ARGS} . endif USE_BINUTILS= yes -CONFIGURE_ENV+= F77="${F77}" F90="${F90}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}" -MAKE_ENV+= F77="${F77}" F90="${F90}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}" +CONFIGURE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}" +MAKE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}" .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202211011854.2A1IsoUq084646>