[Pkg-openmpi-maintainers] Bug#752785: patch for pkgconfig vars

[Alastair McKinstry]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Hi,

Would you please consider this patch (attached) to provide the necessary
variables to the ompi.pc file, so that ompi.pc can be a generic alias
for mpi.pc?

thanks
Alastair

- -- 
Alastair McKinstry, <alastair at sceal.ie>, <mckinstry at debian.org>,
https://diaspora.sceal.ie/u/amckinstry
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAEBCAAGBQJUM9L/AAoJEN9LdrZRJ3QsL0kP/jUrXUZhUiWZD/7ShdumzvGz
zW1bzt4rkee9261DsEdw1/qhTyCM/vZvYQus7RBs4VROFpWfV/YEz/EtZydb0ZPb
4328vZeqhm3+eiB2d2/M3VIzW6ZA1P4sNL9rIxorXqs3DXoKdskHTZJDLaE0JQ5d
MyE89RP+WE7pkpxnu1cCVVv/CCgdXH4rw1/jE1y8QX/oKUwv8Jo+8Gp0bT0DB3oj
vkYIfei2qZaUNgt+Npj7B8eGv3KBmxmTmTLGuiAfhoIPKwZLSB1m5lnW+PSZpCzf
XxdeBtpvksBP/sVVR0HYYmZauOSkk2LjpdjwwFGl3nrb7miE5nKmJmHNoILPZKOc
tq0HeUN0lP9NweKbU4XUzroZ5LVp61RPWxhBrlJw7SMuLuPIqhWEORpdHzu9xJyk
iZ/Oeh9rs3xYpHJEDPSh5sFjsI13+e9Q6sq0jzyxtgxnAQE9v2TDyFXccCI2/EcP
Npsy8YpvQkgKudbLnwGwEZd+PJdApyTKmKrMnQw3HLJllq6q/SbUcxIKoL/XeFc0
qtNMAjHHCW5GOcBzyy6r7DU8A4g2EZ/XB9aOGyzAgFVfM9xLjuaLuDmSKjuJB1de
Ifya0f3Ixtk/5ffmwvBWptjQoaE5xdZH4fgGhBZ9A/KyXjosBntya8ZPKjXfN1dH
oD+Pp8Cg3m+ScW9J7OmP
=Ovqe
-----END PGP SIGNATURE-----

-------------- next part --------------
Author: Alastair McKinstry <mckinstry at debian.org>
Origin-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752785
Description: Add variables needed to make  mpi.pc an alias for ompi.pc
Last-Updated: 2014-10-07
Forwarded: no

Index: openmpi-1.6.5/ompi/tools/wrappers/ompi.pc.in
===================================================================
--- openmpi-1.6.5.orig/ompi/tools/wrappers/ompi.pc.in
+++ openmpi-1.6.5/ompi/tools/wrappers/ompi.pc.in
@@ -14,7 +14,7 @@ libdir=@libdir@
 # static linking (they're pulled in by libopen-rte.so's implicit
 # dependencies), so only list these in Libs.private.
 #
-Libs: -L${libdir} @OMPI_WRAPPER_EXTRA_LDFLAGS@ -lmpi
+Libs: -L${libdir} @OMPI_WRAPPER_EXTRA_LDFLAGS@ -lmpi_f90 -lmpi_f77 -lmpi
 Libs.private: @OMPI_WRAPPER_EXTRA_LIBS@
 #
 # It is safe to hard-wire the -I before the EXTRA_INCLUDES because it
@@ -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${includedir} -I${includedir}/@OMPI_WRAPPER_EXTRA_INCLUDES@ @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_CXXFLAGS@
+fcflags= -I${includedir} -I${includedir}/@OMPI_WRAPPER_EXTRA_INCLUDES@ @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_FCFLAGS@
+fflags= -I${includedir} -I${includedir}/@OMPI_WRAPPER_EXTRA_INCLUDES@ @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_FFLAGS@