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 61503283620d4a08b94b5c55e26ff96bc664f4e3 (commit) via 40bacc4ae3872bfbe7cfcbb9ded79054ef14f88b (commit) from ef1cf141c1bd4f498f8a5fc6498ce021d7b030ab (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/61503283620d4a08b94b5c55e26ff96bc6... commit 61503283620d4a08b94b5c55e26ff96bc664f4e3 Author: Ken Raffenetti <[email protected]> Date: Mon Dec 15 13:18:07 2014 -0600 disable libtool versioning for embedded libraries Squashes a warning when using the embedded versions of OPA and MPL. Signed-off-by: Sangmin Seo <[email protected]> diff --git a/configure.ac b/configure.ac index 064ac11..0af4994 100644 --- a/configure.ac +++ b/configure.ac @@ -1163,7 +1163,9 @@ AC_SUBST([mpllibdir]) mpllib="" AC_SUBST([mpllib]) if test "$with_mpl_prefix" = "embedded" ; then - PAC_CONFIG_SUBDIR(src/mpl,,AC_MSG_ERROR(MPL configure failed)) + # no need for libtool versioning when embedding MPL + mpl_subdir_args="--disable-versioning" + PAC_CONFIG_SUBDIR_ARGS([src/mpl],[$mpl_subdir_args],[],[AC_MSG_ERROR(MPL configure failed)]) PAC_APPEND_FLAG([-I${master_top_builddir}/src/mpl/include], [CPPFLAGS]) PAC_APPEND_FLAG([-I${use_top_srcdir}/src/mpl/include], [CPPFLAGS]) @@ -1229,9 +1231,10 @@ if test "$with_openpa_prefix" = "embedded" ; then implementation. See the src/openpa directory for more info.])], [],[with_atomic_primitives=not_specified]) - opa_subdir_args="" + # no need for libtool versioning when embedding OPA + opa_subdir_args="--disable-versioning" if test "$with_atomic_primitives" = "not_specified" ; then - opa_subdir_args="--with-atomic-primitives=auto_allow_emulation" + PAC_APPEND_FLAG([--with-atomic-primitives=auto_allow_emulation], [opa_subdir_args]) fi PAC_CONFIG_SUBDIR_ARGS([src/openpa],[$opa_subdir_args],[],[AC_MSG_ERROR([OpenPA configure failed])]) else http://git.mpich.org/mpich.git/commitdiff/40bacc4ae3872bfbe7cfcbb9ded79054ef... commit 40bacc4ae3872bfbe7cfcbb9ded79054ef14f88b Author: Ken Raffenetti <[email protected]> Date: Thu Dec 4 13:54:58 2014 -0600 remove mpl/opa libs from external flags when embedded We were incorrectly adding the build directories for mpl and opa to external_ldflags in Makefile.am, causing them to be listed in the installed libmpi.la libtool file. If a linker does not handle this potentially non-existant build directory gracefully, it could cause an issue. Since the mpl and opa libraries are now embedded in libmpi by default, we simply eliminate the flags unless we are using pre-built, external libraries. Fixes #2208 Thanks to Markus Geimer for the bug report and suggested solution. Signed-off-by: Sangmin Seo <[email protected]> diff --git a/Makefile.am b/Makefile.am index d08430e..818f60d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -48,7 +48,7 @@ pkgconfigdir = @pkgconfigdir@ errnames_txt_files = external_subdirs = @mplsrcdir@ @opasrcdir@ -external_ldflags = -L@mpllibdir@ -L@opalibdir@ +external_ldflags = @mpllibdir@ @opalibdir@ external_libs = @EXTERNAL_LIBS@ mpi_convenience_libs = pmpi_convenience_libs = @mpllib@ @opalib@ diff --git a/configure.ac b/configure.ac index 552e1d9..064ac11 100644 --- a/configure.ac +++ b/configure.ac @@ -1167,7 +1167,6 @@ if test "$with_mpl_prefix" = "embedded" ; then PAC_APPEND_FLAG([-I${master_top_builddir}/src/mpl/include], [CPPFLAGS]) PAC_APPEND_FLAG([-I${use_top_srcdir}/src/mpl/include], [CPPFLAGS]) - mpllibdir="${master_top_builddir}/src/mpl" mplsrcdir="${master_top_builddir}/src/mpl" mpllib="src/mpl/lib${MPLLIBNAME}.la" else @@ -1178,7 +1177,7 @@ else PAC_APPEND_FLAG([-I${with_mpl_prefix}/include],[CPPFLAGS]) PAC_PREPEND_FLAG([-l${MPLLIBNAME}],[EXTERNAL_LIBS]) PAC_APPEND_FLAG([-L${with_mpl_prefix}/lib],[WRAPPER_LDFLAGS]) - mpllibdir="${with_mpl_prefix}/lib" + mpllibdir="-L${with_mpl_prefix}/lib" fi # OpenPA @@ -1218,7 +1217,6 @@ AC_SUBST([opalib]) if test "$with_openpa_prefix" = "embedded" ; then if test -e "${use_top_srcdir}/src/openpa" ; then opasrcdir="${master_top_builddir}/src/openpa" - opalibdir="${master_top_builddir}/src/openpa/src" opalib="${master_top_builddir}/src/openpa/src/lib${OPALIBNAME}.la" PAC_APPEND_FLAG([-I${use_top_srcdir}/src/openpa/src],[CPPFLAGS]) PAC_APPEND_FLAG([-I${master_top_builddir}/src/openpa/src],[CPPFLAGS]) @@ -1254,9 +1252,9 @@ else PAC_PREPEND_FLAG([-l${OPALIBNAME}],[EXTERNAL_LIBS]) if test -d ${with_openpa_prefix}/lib64 ; then PAC_APPEND_FLAG([-L${with_openpa_prefix}/lib64],[WRAPPER_LDFLAGS]) - opalibdir="${with_openpa_prefix}/lib64" + opalibdir="-L${with_openpa_prefix}/lib64" else - opalibdir="${with_openpa_prefix}/lib" + opalibdir="-L${with_openpa_prefix}/lib" fi PAC_APPEND_FLAG([-L${with_openpa_prefix}/lib],[WRAPPER_LDFLAGS]) fi diff --git a/examples/Makefile.am b/examples/Makefile.am index 40d4cff..a6fe6bf 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -36,14 +36,14 @@ cpi_DEPENDENCIES = # the make-time instances of libpmpi.la and libmpi.la live here AM_LDFLAGS += -L../lib # the make-time instances of libmpl.la and libopa.la live here -AM_LDFLAGS += -L@mpllibdir@ -L@opalibdir@ +AM_LDFLAGS += @mpllibdir@ @opalibdir@ # Wrapper LDFLAGS need to be added at the end to make sure we link # with the libraries we just built, and not any previously installed # libraries. AM_LDFLAGS += $(WRAPPER_LDFLAGS) -external_libs = -l@MPLLIBNAME@ -l@OPALIBNAME@ $(WRAPPER_LIBS) +external_libs = $(WRAPPER_LIBS) if BUILD_PROFILING_LIB LIBS += -l@PMPILIBNAME@ cpi_DEPENDENCIES += ../lib/lib@[email protected] ----------------------------------------------------------------------- Summary of changes: Makefile.am | 2 +- configure.ac | 17 +++++++++-------- examples/Makefile.am | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) hooks/post-receive -- MPICH primary repository