Merge pull request #1982 from jsquyres/pr/fix-pkg-config-static

pkg-config: fix static linking

Author: jsquyres

ompi/tools/wrappers/ompi-c.pc.in

@@ -15,6 +15,6 @@ libdir=@libdir@
 # dependencies), so only list these in Libs.private.
 #
 Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ -lmpi
-Libs.private: @OMPI_WRAPPER_EXTRA_LIBS@
+Libs.private: -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
 #
 Cflags: -I${includedir} @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_CFLAGS@

ompi/tools/wrappers/ompi-cxx.pc.in

@@ -15,6 +15,6 @@ libdir=@libdir@
 # dependencies), so only list these in Libs.private.
 #
 Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ @OMPI_WRAPPER_CXX_LIB@ -lmpi
-Libs.private: @OMPI_WRAPPER_EXTRA_LIBS@
+Libs.private: -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
 #
 Cflags: -I${includedir} @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_CXXFLAGS@

ompi/tools/wrappers/ompi-fort.pc.in

@@ -15,5 +15,5 @@ libdir=@libdir@
 # dependencies), so only list these in Libs.private.
 #
 Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ @OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -lmpi_mpifh -lmpi
-Libs.private: @OMPI_WRAPPER_EXTRA_LIBS@
+Libs.private: -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
 Cflags: -I${includedir} @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_FCFLAGS@

orte/tools/wrappers/orte.pc.in

@@ -15,7 +15,7 @@ libdir=@libdir@
 # dependencies), so only list these in Libs.private.
 #
 Libs: -L${libdir} @ORTE_PKG_CONFIG_LDFLAGS@ -lopen-rte
-Libs.private: @ORTE_WRAPPER_EXTRA_LIBS@
+Libs.private: -lopen-pal @ORTE_WRAPPER_EXTRA_LIBS@
 #
 # It is safe to hard-wire the -I before the EXTRA_INCLUDES because we
 # will not be installing this .pc file unless --enable-devel-headers is