From 8c17722f7cecd5038fafa264099b579a4be720a6 Mon Sep 17 00:00:00 2001 From: Alastair McKinstry Date: Mon, 1 Jan 2024 17:14:56 +0000 Subject: [PATCH] Enable non-gfortran compilation by separating Fortran libs Last-Updated: 2023-12-31 Forwarded: no Note pkg-config files shipped in arch-dep libopenmpi-dev Don't put FMODDIR in wrapper-data (openmpi-common is arch-indep) Gbp-Pq: Name pkg-config.patch --- ompi/tools/wrappers/ompi-c.pc.in | 2 +- ompi/tools/wrappers/ompi-fort.pc.in | 8 ++++++-- ompi/tools/wrappers/ompi.pc.in | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ompi/tools/wrappers/ompi-c.pc.in b/ompi/tools/wrappers/ompi-c.pc.in index be29ad77..4f2f8932 100644 --- a/ompi/tools/wrappers/ompi-c.pc.in +++ b/ompi/tools/wrappers/ompi-c.pc.in @@ -19,4 +19,4 @@ pkgincludedir=@opalincludedir@ Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ -l@OMPI_LIBMPI_NAME@ Libs.private: -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@ # -Cflags: -I${includedir} @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_CFLAGS@ +Cflags: -I${includedir} -I@FMODDIR@/openmpi @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_CFLAGS@ diff --git a/ompi/tools/wrappers/ompi-fort.pc.in b/ompi/tools/wrappers/ompi-fort.pc.in index 5635870b..014806ea 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 +flibdir=${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${flibdir} -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@ +Cflags: -I${includedir} -I@FMODDIR@/openmpi @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_FCFLAGS@ diff --git a/ompi/tools/wrappers/ompi.pc.in b/ompi/tools/wrappers/ompi.pc.in index c6961869..c25ae52f 100644 --- a/ompi/tools/wrappers/ompi.pc.in +++ b/ompi/tools/wrappers/ompi.pc.in @@ -19,4 +19,4 @@ pkgincludedir=@opalincludedir@ Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ -l@OMPI_LIBMPI_NAME@ Libs.private: @OMPI_WRAPPER_EXTRA_LIBS@ # -Cflags: -I${includedir} @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_CFLAGS@ +Cflags: -I${includedir} -I@FMODDIR@/openmpi @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_CFLAGS@ -- 2.30.2