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 e24b44a721b37a92cfc46baa12c037c25a25efb5 (commit) from b912961fbd620568dd0ec36515720739f0fb0be9 (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/e24b44a721b37a92cfc46baa12c037c25a... commit e24b44a721b37a92cfc46baa12c037c25a25efb5 Author: Pavan Balaji <[email protected]> Date: Sat Apr 5 19:42:59 2014 -0500 Reorder libmpi and libpmpi builds. libmpi depends on libpmpi. We need to build them in that order to make sure the dependencies are satisfied. libtool should do this automatically, but it does not. More description of the error is available here: https://bugzilla.redhat.com/show_bug.cgi?id=91110 Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/Makefile.am b/Makefile.am index acf89f2..fc9e804 100644 --- a/Makefile.am +++ b/Makefile.am @@ -141,6 +141,9 @@ if BUILD_PROFILING_LIB lib_lib@PMPILIBNAME@_la_LIBADD = endif BUILD_PROFILING_LIB +lib_lib@MPILIBNAME@_la_SOURCES = +lib_lib@MPILIBNAME@_la_LDFLAGS = +lib_lib@MPILIBNAME@_la_CPPFLAGS = lib_lib@MPILIBNAME@_la_LIBADD = if BUILD_F77_BINDING @@ -155,24 +158,28 @@ endif BUILD_CXX_BINDING include maint/Makefile.mk include src/Makefile.mk -lib_LTLIBRARIES += lib/lib@[email protected] -lib_lib@MPILIBNAME@_la_SOURCES = $(mpi_sources) -lib_lib@MPILIBNAME@_la_LDFLAGS = $(external_ldflags) $(ABIVERSIONFLAGS) -lib_lib@MPILIBNAME@_la_LIBADD += $(external_libs) -lib_lib@MPILIBNAME@_la_CPPFLAGS = $(AM_CPPFLAGS) - if BUILD_PROFILING_LIB lib_LTLIBRARIES += lib/lib@[email protected] # dropping mpi_fc_sources and mpi_cxx_sources from the below PMPI list # since they don't contribute any PMPI symbols. lib_lib@PMPILIBNAME@_la_SOURCES = $(mpi_sources) $(mpi_f77_sources) $(mpi_core_sources) -lib_lib@PMPILIBNAME@_la_LDFLAGS = $(ABIVERSIONFLAGS) +lib_lib@PMPILIBNAME@_la_LDFLAGS = $(external_ldflags) $(ABIVERSIONFLAGS) +lib_lib@PMPILIBNAME@_la_LIBADD += $(external_libs) lib_lib@MPILIBNAME@_la_CPPFLAGS += -DMPICH_MPI_FROM_PMPI lib_lib@MPILIBNAME@_la_LIBADD += lib/lib@[email protected] else !BUILD_PROFILING_LIB lib_lib@MPILIBNAME@_la_SOURCES += $(mpi_core_sources) +lib_lib@MPILIBNAME@_la_LIBADD += $(external_libs) endif !BUILD_PROFILING_LIB +# lib@[email protected] might depend on lib@[email protected]. We add them +# in that order to lib_LTLIBRARIES so libtool doesn't get +# confused. (see https://bugzilla.redhat.com/show_bug.cgi?id=91110) +lib_LTLIBRARIES += lib/lib@[email protected] +lib_lib@MPILIBNAME@_la_SOURCES += $(mpi_sources) +lib_lib@MPILIBNAME@_la_LDFLAGS += $(external_ldflags) $(ABIVERSIONFLAGS) +lib_lib@MPILIBNAME@_la_CPPFLAGS += $(AM_CPPFLAGS) + if BUILD_F77_BINDING lib_LTLIBRARIES += lib/lib@[email protected] lib_lib@MPIFCLIBNAME@_la_CPPFLAGS = $(AM_CPPFLAGS) ----------------------------------------------------------------------- Summary of changes: Makefile.am | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) hooks/post-receive -- MPICH primary repository