From: Debian Open MPI Maintainers Date: Fri, 14 Nov 2014 16:57:11 +0000 (+0000) Subject: pkgconfig-vars X-Git-Tag: archive/raspbian/2.1.1-7+rpi1~1^2^2^2^2^2^2^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=db9cf163fedfa7a9c8f7c1255b72c7549d09d6e0;p=openmpi.git pkgconfig-vars Gbp-Pq: Name pkgconfig-vars.patch --- diff --git a/ompi/tools/wrappers/ompi.pc.in b/ompi/tools/wrappers/ompi.pc.in index 34fe36fe..76ea3007 100644 --- a/ompi/tools/wrappers/ompi.pc.in +++ b/ompi/tools/wrappers/ompi.pc.in @@ -15,7 +15,7 @@ libdir=@libdir@ # dependencies), so only list these in Libs.private. # Libs: -L${libdir} @OMPI_WRAPPER_EXTRA_LDFLAGS@ -lmpi -Libs.private: @OMPI_WRAPPER_EXTRA_LIBS@ +Libs.private: @OMPI_WRAPPER_EXTRA_LIBS@ -lmpi_f90 -lmpi_f77 -lmpi # # It is safe to hard-wire the -I before the EXTRA_INCLUDES because it # will either contain "openmpi" or be blank. Hence, it'll either @@ -23,3 +23,8 @@ Libs.private: @OMPI_WRAPPER_EXTRA_LIBS@ # redundant (ick), but safe. # Cflags: -I${includedir} -I${includedir}/@OMPI_WRAPPER_EXTRA_INCLUDES@ @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_CFLAGS@ +# +# Add variables to be queried in specific cases. Match variables in mpich.pc +cxxflags= -I -I/@OMPI_WRAPPER_EXTRA_INCLUDES@ @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_CXXFLAGS@ +fcflags= -I -I/@OMPI_WRAPPER_EXTRA_INCLUDES@ @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_FCFLAGS@ +fflags= -I -I/@OMPI_WRAPPER_EXTRA_INCLUDES@ @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_FFLAGS@