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 259e65db9ecda965c47949295adc80978913fd80 (commit) from d207289628674edd0f4036f1745a1b97d6eaa403 (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/259e65db9ecda965c47949295adc809789... commit 259e65db9ecda965c47949295adc80978913fd80 Author: Pavan Balaji <[email protected]> Date: Sun May 5 16:05:20 2013 -0500 Revert IBM hwloc versioning patch. This patch is not required since mpich does not build libhwloc at all. It always builds libhwloc_embedded which is neither versioned nor installed. No reviewer. diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/configure.ac b/src/pm/hydra/tools/topo/hwloc/hwloc/configure.ac index 5700b77..db3bd69 100644 --- a/src/pm/hydra/tools/topo/hwloc/hwloc/configure.ac +++ b/src/pm/hydra/tools/topo/hwloc/hwloc/configure.ac @@ -187,20 +187,6 @@ fi # Is ltdl included? # AM_CONDITIONAL([HWLOC_LTDL_INCLUDED], [test "x$with_included_ltdl" = xyes]) - -## Enable creation of libtool-style versioning or no versioning -AC_ARG_ENABLE(versioning, - [AC_HELP_STRING([--enable-versioning],[Enable library versioning])],, - [enable_versioning=yes]) - -if test "$enable_versioning" = "yes" ; then - libhwloc_so_versionflags="-version-info \$(libhwloc_so_version)" -else - libhwloc_so_versionflags="-avoid-version" -fi -export libhwloc_so_versionflags -AC_SUBST(libhwloc_so_versionflags) - # Party on AC_OUTPUT diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/src/Makefile.am b/src/pm/hydra/tools/topo/hwloc/hwloc/src/Makefile.am index 44413cd..53de278 100644 --- a/src/pm/hydra/tools/topo/hwloc/hwloc/src/Makefile.am +++ b/src/pm/hydra/tools/topo/hwloc/hwloc/src/Makefile.am @@ -201,7 +201,7 @@ endif HWLOC_HAVE_WINDOWS # Installable library libhwloc_la_SOURCES = $(sources) -libhwloc_la_LDFLAGS = $(ldflags) $(libhwloc_so_versionflags) $(HWLOC_LIBS) +libhwloc_la_LDFLAGS = $(ldflags) -version-info $(libhwloc_so_version) $(HWLOC_LIBS) if HWLOC_HAVE_PLUGINS AM_CPPFLAGS += $(LTDLINCL) ----------------------------------------------------------------------- Summary of changes: src/pm/hydra/tools/topo/hwloc/hwloc/configure.ac | 14 -------------- .../hydra/tools/topo/hwloc/hwloc/src/Makefile.am | 2 +- 2 files changed, 1 insertions(+), 15 deletions(-) hooks/post-receive -- MPICH primary repository