From 5d99ab6b6de07b8b2bada2cdb03dd18b1439c051 Mon Sep 17 00:00:00 2001 From: Alastair McKinstry Date: Mon, 11 Apr 2022 08:32:17 +0100 Subject: [PATCH] Enable non-gfortran compilation Last-Updated: 2020-01-13 Forwarded: no Gbp-Pq: Name pkg-config.patch --- ompi/tools/wrappers/ompi-fort.pc.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ompi/tools/wrappers/ompi-fort.pc.in b/ompi/tools/wrappers/ompi-fort.pc.in index 5635870b..7441395f 100644 --- a/ompi/tools/wrappers/ompi-fort.pc.in +++ b/ompi/tools/wrappers/ompi-fort.pc.in @@ -11,11 +11,15 @@ exec_prefix=@exec_prefix@ includedir=@includedir@ libdir=@libdir@ pkgincludedir=@opalincludedir@ +# override $fortran with --define-variable when building on non-gfortran compile +fortran=gfortran +fortrandir=${libdir}/../../fortran/${fortran} + # # Note that -lopen-pal and all the EXTRA_LIBS are only necessary when # static linking (they're pulled in by libopen-rte.so's implicit # dependencies), so only list these in Libs.private. # -Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ @OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -l@OMPI_LIBMPI_NAME@_mpifh -l@OMPI_LIBMPI_NAME@ +Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ @OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -l@OMPI_LIBMPI_NAME@_mpifh -l@OMPI_LIBMPI_NAME@ Libs.private: -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@ Cflags: -I${includedir} @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_FCFLAGS@ -- 2.30.2