[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-33-gf7a478d

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  f7a478d238a80d647eca1d965ab83a329ac75975 (commit)
      from  606f9b687230dcd3537e538e6983f8e7b573cd76 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/f7a478d238a80d647eca1d965ab83a329ac75975

commit f7a478d238a80d647eca1d965ab83a329ac75975
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Thu Sep 3 13:16:36 2015 -0500

    link MPL with included process managers
    
    Process managers gforker, remshell, and their generic utils all rely on
    MPL functionality, so we add explicit links in each Makefile.mk. In order
    for libtool to handle the heavy lifting when linking MPL with libmpiexec,
    we convert libmpiexec to a libtool convenience library.
    
    To support both embedded and external MPL libraries, we always define
    mpllibdir in configure.ac and add to LDFLAGS where needed.
    
    Fixes #2299
    
    Signed-off-by: Rob Latham <robl at mcs.anl.gov>

diff --git a/configure.ac b/configure.ac
index d7ebe34..ffb233e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1176,6 +1176,7 @@ if test "$with_mpl_prefix" = "embedded" ; then
     PAC_APPEND_FLAG([-I${use_top_srcdir}/src/mpl/include], [CPPFLAGS])
 
     mplsrcdir="${master_top_builddir}/src/mpl"
+    mpllibdir="-L${master_top_builddir}/src/mpl"
     mpllib="src/mpl/lib${MPLLIBNAME}.la"
 else
     # The user specified an already-installed MPL; just sanity check, don't
diff --git a/src/pm/gforker/Makefile.mk b/src/pm/gforker/Makefile.mk
index 3a15605..3b3d032 100644
--- a/src/pm/gforker/Makefile.mk
+++ b/src/pm/gforker/Makefile.mk
@@ -16,13 +16,17 @@ if BUILD_PM_GFORKER
 if PRIMARY_PM_GFORKER
 bin_PROGRAMS += src/pm/gforker/mpiexec
 src_pm_gforker_mpiexec_SOURCES = src/pm/gforker/mpiexec.c 
-src_pm_gforker_mpiexec_LDADD = src/pm/util/libmpiexec.a $(mpllib)
+src_pm_gforker_mpiexec_LDADD = src/pm/util/libmpiexec.la -l$(MPLLIBNAME)
+src_pm_gforker_mpiexec_LDFLAGS = $(mpllibdir)
+EXTRA_src_pm_gforker_mpiexec_DEPENDENCIES = $(mpllib)
 # we may not want to add AM_CPPFLAGS for this program
 src_pm_gforker_mpiexec_CPPFLAGS = $(common_pm_includes) $(AM_CPPFLAGS)
 else !PRIMARY_PM_GFORKER
 bin_PROGRAMS += src/pm/gforker/mpiexec.gforker
 src_pm_gforker_mpiexec_gforker_SOURCES = src/pm/gforker/mpiexec.c 
-src_pm_gforker_mpiexec_gforker_LDADD = src/pm/util/libmpiexec.a
+src_pm_gforker_mpiexec_gforker_LDADD = src/pm/util/libmpiexec.la -l$(MPLLIBNAME)
+src_pm_gforker_mpiexec_gforker_LDFLAGS = $(mpllibdir)
+EXTRA_src_pm_gforker_mpiexec_gforker_DEPENDENCIES = $(mpllib)
 # we may not want to add AM_CPPFLAGS for this program
 src_pm_gforker_mpiexec_gforker_CPPFLAGS = $(common_pm_includes) $(AM_CPPFLAGS)
 endif !PRIMARY_PM_GFORKER
diff --git a/src/pm/remshell/Makefile.mk b/src/pm/remshell/Makefile.mk
index ea366a9..fbd60bb 100644
--- a/src/pm/remshell/Makefile.mk
+++ b/src/pm/remshell/Makefile.mk
@@ -16,13 +16,17 @@ if BUILD_PM_REMSHELL
 if PRIMARY_PM_REMSHELL
 bin_PROGRAMS += src/pm/remshell/mpiexec
 src_pm_remshell_mpiexec_SOURCES = src/pm/remshell/mpiexec.c 
-src_pm_remshell_mpiexec_LDADD = src/pm/util/libmpiexec.a
+src_pm_remshell_mpiexec_LDADD = src/pm/util/libmpiexec.la -l$(MPLLIBNAME)
+src_pm_remshell_mpiexec_LDFLAGS = $(mpllibdir)
+EXTRA_src_pm_remshell_mpiexec_DEPENDENCIES = $(mpllib)
 # we may not want to add AM_CPPFLAGS for this program
 src_pm_remshell_mpiexec_CPPFLAGS = $(common_pm_includes) $(AM_CPPFLAGS)
 else !PRIMARY_PM_REMSHELL
 bin_PROGRAMS += src/pm/remshell/mpiexec.remshell
 src_pm_remshell_mpiexec_remshell_SOURCES = src/pm/remshell/mpiexec.c 
-src_pm_remshell_mpiexec_remshell_LDADD = src/pm/util/libmpiexec.a
+src_pm_remshell_mpiexec_remshell_LDADD = src/pm/util/libmpiexec.la -l$(MPLLIBNAME)
+src_pm_remshell_mpiexec_remshell_LDFLAGS = $(mpllibdir)
+EXTRA_src_pm_remshell_mpiexec_remshell_DEPENDENCIES = $(mpllib)
 # we may not want to add AM_CPPFLAGS for this program
 src_pm_remshell_mpiexec_remshell_CPPFLAGS = $(common_pm_includes) $(AM_CPPFLAGS)
 endif !PRIMARY_PM_REMSHELL
diff --git a/src/pm/util/Makefile.mk b/src/pm/util/Makefile.mk
index 83e273f..7b618ff 100644
--- a/src/pm/util/Makefile.mk
+++ b/src/pm/util/Makefile.mk
@@ -17,15 +17,20 @@ if BUILD_PM_UTIL
 ## FIXME do we need this still?
 ##OTHER_DIRS = test
 
-noinst_LIBRARIES += src/pm/util/libmpiexec.a
+noinst_LTLIBRARIES += src/pm/util/libmpiexec.la
 
 # Ensure that dgbiface is compiled with the -g option, as the symbols must
 # be present for the debugger to see them
-src_pm_util_libmpiexec_a_CFLAGS = -g $(AM_CFLAGS)
+src_pm_util_libmpiexec_la_CFLAGS = -g $(AM_CFLAGS)
 
 # we may want to omit the regular AM_CPPFLAGS when building objects in this
 # utility library
-src_pm_util_libmpiexec_a_CPPFLAGS = $(common_pm_includes) $(AM_CPPFLAGS)
+src_pm_util_libmpiexec_la_CPPFLAGS = $(common_pm_includes) $(AM_CPPFLAGS)
+
+# MPL
+src_pm_util_libmpiexec_la_LIBADD = -l$(MPLLIBNAME)
+src_pm_util_libmpiexec_la_LDFLAGS = $(mpllibdir)
+EXTRA_src_pm_util_libmpiexec_la_DEPENDENCIES = $(mpllib)
 
 # We use the msg print routines (for now) - include these in the mpiexec
 # library so that we don't need to copy the source files
@@ -35,7 +40,7 @@ src_pm_util_libmpiexec_a_CPPFLAGS = $(common_pm_includes) $(AM_CPPFLAGS)
 # be used by other applications).
 #
 # [goodell] FIXME the above comment is basically unintelligible...
-src_pm_util_libmpiexec_a_SOURCES = \
+src_pm_util_libmpiexec_la_SOURCES = \
     src/pm/util/cmnargs.c          \
     src/pm/util/process.c          \
     src/pm/util/ioloop.c           \

-----------------------------------------------------------------------

Summary of changes:
 configure.ac                |    1 +
 src/pm/gforker/Makefile.mk  |    8 ++++++--
 src/pm/remshell/Makefile.mk |    8 ++++++--
 src/pm/util/Makefile.mk     |   13 +++++++++----
 4 files changed, 22 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
MPICH primary repository