wrappers: Improve static library handling

Improve static application build handling in the wrapper compilers by
tracking both LIBS (the libraries libmpi/libopen-pal depend on) and
LIBS_STATIC (the libraries those libraries depend on), and improve
the behavior of static/dynamic linking with the wrapper compilers, to
make them similar to the pkg-config behaviors.  See the overly verbose
comment in opal_setup_wrappers.m4 for the intended behavior.

Finally, start tracking pkg-config module dependencies, when possible.

Signed-off-by: Brian Barrett <bbarrett@amazon.com>

Author: bwbarrett

config/opal_set_lib_name.m4

@@ -3,6 +3,8 @@
 # Copyright (c) 2014      Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2016      IBM Corporation.  All rights reserved.
 # Copyright (c) 2020      Intel, Inc.  All rights reserved.
+# Copyright (c) 2022      Amazon.com, Inc. or its affiliates.
+#                         All Rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -44,6 +46,8 @@ AC_DEFUN([OMPI_SET_LIB_NAME],[
     AS_IF([test "$with_libmpi_name" = "" || test "$with_libmpi_name" = "yes"],
         [with_libmpi_name="mpi"])
 
-    AC_MSG_RESULT([$with_libmpi_name])
-    AC_SUBST(OMPI_LIBMPI_NAME, $with_libmpi_name)
+    OMPI_LIBMPI_NAME=${with_libmpi_name}
+
+    AC_MSG_RESULT([$OMPI_LIBMPI_NAME])
+    AC_SUBST(OMPI_LIBMPI_NAME)
 ])dnl

config/opal_setup_wrappers.m4

@@ -14,7 +14,7 @@
  * Copyright (c) 2014-2019 Research Organization for Information Science
  *                         and Technology (RIST).  All rights reserved.
  * Copyright (c) 2015-2019 Intel, Inc.  All rights reserved.
- * Copyright (c) 2018-2021 Amazon.com, Inc. or its affiliates.  All Rights reserved.
+ * Copyright (c) 2018-2022 Amazon.com, Inc. or its affiliates.  All Rights reserved.
  * Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
  * $COPYRIGHT$
  *
@@ -608,16 +608,16 @@ void ompi_info_do_config(bool want_all)
         opal_info_out("Build LDFLAGS", "option:build:ldflags", OMPI_BUILD_LDFLAGS);
         opal_info_out("Build LIBS", "option:build:libs", OMPI_BUILD_LIBS);
 
-        opal_info_out("Wrapper extra CFLAGS", "option:wrapper:extra_cflags",
-                      WRAPPER_EXTRA_CFLAGS);
-        opal_info_out("Wrapper extra CXXFLAGS", "option:wrapper:extra_cxxflags",
-                      WRAPPER_EXTRA_CXXFLAGS);
-        opal_info_out("Wrapper extra FCFLAGS", "option:wrapper:extra_fcflags",
-                      WRAPPER_EXTRA_FCFLAGS);
-        opal_info_out("Wrapper extra LDFLAGS", "option:wrapper:extra_ldflags",
-                      WRAPPER_EXTRA_LDFLAGS);
-        opal_info_out("Wrapper extra LIBS", "option:wrapper:extra_libs",
-                      WRAPPER_EXTRA_LIBS);
+        opal_info_out("Wrapper CFLAGS", "option:wrapper:cflags",
+                      OMPI_WRAPPER_CFLAGS);
+        opal_info_out("Wrapper CXXFLAGS", "option:wrapper:cxxflags",
+                      OMPI_WRAPPER_CXXFLAGS);
+        opal_info_out("Wrapper FCFLAGS", "option:wrapper:fcflags",
+                      OMPI_WRAPPER_FCFLAGS);
+        opal_info_out("Wrapper LDFLAGS", "option:wrapper:ldflags",
+                      OMPI_WRAPPER_LDFLAGS);
+        opal_info_out("Wrapper LIBS", "option:wrapper:libs",
+                      OMPI_WRAPPER_LIBS);
     }
 
     opal_info_out("Internal debug support", "option:debug", debug);

ompi/tools/ompi_info/param.c

@@ -12,16 +12,13 @@ language=C++
 compiler_env=CXX
 compiler_flags_env=CXXFLAGS
 compiler=@CXX@
-preprocessor_flags=@OMPI_WRAPPER_EXTRA_CPPFLAGS@
-compiler_flags_prefix=@OMPI_WRAPPER_EXTRA_CXXFLAGS_PREFIX@
-compiler_flags=@OMPI_WRAPPER_EXTRA_CXXFLAGS@
-linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
-# Note that per https://svn.open-mpi.org/trac/ompi/ticket/3422, we
-# intentionally only link in the MPI libraries (OPAL, etc. are
-# pulled in implicitly) because we intend MPI applications to only use
-# the MPI API.
-libs=@OMPI_WRAPPER_CXX_LIB@ -l@OMPI_LIBMPI_NAME@
-libs_static=@OMPI_WRAPPER_CXX_LIB@ -l@OMPI_LIBMPI_NAME@ -l@OPAL_LIB_NAME@ @OMPI_WRAPPER_EXTRA_LIBS@
+preprocessor_flags=@OMPI_WRAPPER_CPPFLAGS@
+compiler_flags_prefix=@OMPI_WRAPPER_CXXFLAGS_PREFIX@
+compiler_flags=@OMPI_WRAPPER_CXXFLAGS@
+linker_flags=@OMPI_WRAPPER_LDFLAGS@
+linker_flags_static=@OMPI_WRAPPER_LDFLAGS_STATIC@
+libs=@OMPI_WRAPPER_LIBS@
+libs_static=@OMPI_WRAPPER_LIBS_STATIC@
 dyn_lib_file=lib@OMPI_LIBMPI_NAME@.@OPAL_DYN_LIB_SUFFIX@
 static_lib_file=lib@OMPI_LIBMPI_NAME@.a
 required_file=@OMPI_WRAPPER_CXX_REQUIRED_FILE@

ompi/tools/wrappers/mpic++-wrapper-data.txt.in

@@ -12,16 +12,13 @@ language=C
 compiler_env=CC
 compiler_flags_env=CFLAGS
 compiler=@WRAPPER_CC@
-preprocessor_flags=@OMPI_WRAPPER_EXTRA_CPPFLAGS@
-compiler_flags_prefix=@OMPI_WRAPPER_EXTRA_CFLAGS_PREFIX@
-compiler_flags=@OMPI_WRAPPER_EXTRA_CFLAGS@
-linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
-# Note that per https://svn.open-mpi.org/trac/ompi/ticket/3422, we
-# intentionally only link in the MPI libraries (OPAL, etc. are
-# pulled in implicitly) because we intend MPI applications to only use
-# the MPI API.
-libs=-l@OMPI_LIBMPI_NAME@
-libs_static=-l@OMPI_LIBMPI_NAME@ -l@OPAL_LIB_NAME@ @OMPI_WRAPPER_EXTRA_LIBS@
+preprocessor_flags=@OMPI_WRAPPER_CPPFLAGS@
+compiler_flags_prefix=@OMPI_WRAPPER_CFLAGS_PREFIX@
+compiler_flags=@OMPI_WRAPPER_CFLAGS@
+linker_flags=@OMPI_WRAPPER_LDFLAGS@
+linker_flags_static=@OMPI_WRAPPER_LDFLAGS_STATIC@
+libs=@OMPI_WRAPPER_LIBS@
+libs_static=@OMPI_WRAPPER_LIBS_STATIC@
 dyn_lib_file=lib@OMPI_LIBMPI_NAME@.@OPAL_DYN_LIB_SUFFIX@
 static_lib_file=lib@OMPI_LIBMPI_NAME@.a
 required_file=

ompi/tools/wrappers/mpicc-wrapper-data.txt.in

@@ -13,15 +13,12 @@ compiler_env=FC
 compiler_flags_env=FCFLAGS
 compiler=@FC@
 preprocessor_flags=
-compiler_flags_prefix=@OMPI_WRAPPER_EXTRA_FCFLAGS_PREFIX@
-compiler_flags=@OMPI_WRAPPER_EXTRA_FCFLAGS@
-linker_flags=@OMPI_WRAPPER_EXTRA_FC_LDFLAGS@
-# Note that per https://svn.open-mpi.org/trac/ompi/ticket/3422, we
-# intentionally only link in the MPI libraries (OPAL, etc. are
-# pulled in implicitly) because we intend MPI applications to only use
-# the MPI API.
-libs=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ @OMPI_FORTRAN_MPIFH_LINK@ -l@OMPI_LIBMPI_NAME@
-libs_static=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ @OMPI_FORTRAN_MPIFH_LINK@ -l@OMPI_LIBMPI_NAME@ -l@OPAL_LIB_NAME@ @OMPI_WRAPPER_EXTRA_LIBS@
+compiler_flags_prefix=@OMPI_WRAPPER_FCFLAGS_PREFIX@
+compiler_flags=@OMPI_WRAPPER_FCFLAGS@
+linker_flags=@OMPI_WRAPPER_FC_LDFLAGS@
+linker_flags_static=@OMPI_WRAPPER_FC_LDFLAGS_STATIC@
+libs=@OMPI_WRAPPER_FC_LIBS@
+libs_static=@OMPI_WRAPPER_FC_LIBS_STATIC@
 dyn_lib_file=lib@OMPI_LIBMPI_NAME@.@OPAL_DYN_LIB_SUFFIX@
 static_lib_file=lib@OMPI_LIBMPI_NAME@.a
 required_file=@OMPI_WRAPPER_FORTRAN_REQUIRED_FILE@

ompi/tools/wrappers/mpifort-wrapper-data.txt.in

@@ -11,11 +11,9 @@ exec_prefix=@exec_prefix@
 includedir=@includedir@
 libdir=@libdir@
 pkgincludedir=@opalincludedir@
-#
-# Note that -l@OPAL_LIB_NAME@ and all the EXTRA_LIBS are only necessary when
-# static linking, so only list these in Libs.private.
-#
-Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ -l@OMPI_LIBMPI_NAME@
-Libs.private: -l@OPAL_LIB_NAME@ @OMPI_WRAPPER_EXTRA_LIBS@
-#
-Cflags: -I${includedir} @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_CFLAGS@
+
+Libs: @OMPI_PC_LIBS@
+Libs.private: @OMPI_PC_LIBS_PRIVATE@
+Cflags: @OMPI_PC_CFLAGS@
+Requires: @OMPI_PC_MODULES@
+Requires.private: @OMPI_PC_MODULES_PRIVATE@

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

@@ -11,11 +11,9 @@ exec_prefix=@exec_prefix@
 includedir=@includedir@
 libdir=@libdir@
 pkgincludedir=@opalincludedir@
-#
-# Note that @OPAL_LIB_NAME@ and all the EXTRA_LIBS are only necessary when
-# static linking so only list these in Libs.private.
-#
-Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ @OMPI_WRAPPER_CXX_LIB@ -l@OMPI_LIBMPI_NAME@
-Libs.private: -l@OPAL_LIB_NAME@ @OMPI_WRAPPER_EXTRA_LIBS@
-#
-Cflags: -I${includedir} @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_CXXFLAGS@
+
+Libs: @OMPI_PC_LIBS@
+Libs.private: @OMPI_PC_LIBS_PRIVATE@
+Cflags: @OMPI_PC_CFLAGS@
+Requires: @OMPI_PC_MODULES@
+Requires.private: @OMPI_PC_MODULES_PRIVATE@

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

@@ -11,11 +11,9 @@ exec_prefix=@exec_prefix@
 includedir=@includedir@
 libdir=@libdir@
 pkgincludedir=@opalincludedir@
-#
-# Note that -l@OPAL_LIB_NAME@ 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@ @OMPI_FORTRAN_MPIFH_LINK@ -l@OMPI_LIBMPI_NAME@
-Libs.private: -l@OPAL_LIB_NAME@ @OMPI_WRAPPER_EXTRA_LIBS@
-Cflags: -I${includedir} @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_FCFLAGS@
+
+Libs: @OMPI_PC_FC_LIBS@
+Libs.private: @OMPI_PC_FC_LIBS_PRIVATE@
+Cflags: @OMPI_PC_FC_CFLAGS@
+Requires: @OMPI_PC_MODULES@
+Requires.private: @OMPI_PC_MODULES_PRIVATE@

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

@@ -11,12 +11,9 @@ exec_prefix=@exec_prefix@
 includedir=@includedir@
 libdir=@libdir@
 pkgincludedir=@opalincludedir@
-#
-# Note that @OPAL_LIB_NAME@ 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@ -l@OMPI_LIBMPI_NAME@
-Libs.private: -l@OPAL_LIB_NAME@ @OMPI_WRAPPER_EXTRA_LIBS@
-#
-Cflags: -I${includedir} @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_CFLAGS@
+
+Libs: @OMPI_PC_LIBS@
+Libs.private: @OMPI_PC_LIBS_PRIVATE@
+Cflags: @OMPI_PC_CFLAGS@
+Requires: @OMPI_PC_MODULES@
+Requires.private: @OMPI_PC_MODULES_PRIVATE@