From: Alastair McKinstry <mckinstry@debian.org>
Date: Mon, 21 Aug 2023 08:51:43 +0000 (+0100)
Subject: Enable non-gfortran compilation
X-Git-Tag: archive/raspbian/4.1.6-1+rpi1^2^2~11
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ad0bb832151ccc06ef00dd014aa03c7318cdefb7;p=openmpi.git

Enable non-gfortran compilation

Last-Updated: 2020-01-13
Forwarded: no


Gbp-Pq: Name pkg-config.patch
---

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@