Author: balaji Date: 2012-12-09 21:23:54 -0600 (Sun, 09 Dec 2012) New Revision: 10740 Modified: mpich2/trunk/src/pm/hydra/tools/topo/hwloc/hwloc/Makefile.am mpich2/trunk/src/pm/hydra/tools/topo/hwloc/hwloc/autogen.sh mpich2/trunk/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 mpich2/trunk/src/pm/hydra/tools/topo/hwloc/hwloc/configure.ac mpich2/trunk/src/pm/hydra/tools/topo/hwloc/hwloc/include/private/private.h mpich2/trunk/src/pm/hydra/tools/topo/hwloc/hwloc/src/Makefile.am Log: Merge hydra-specific hwloc patches from r10209 and r10332. No reviewer. Modified: mpich2/trunk/src/pm/hydra/tools/topo/hwloc/hwloc/Makefile.am =================================================================== --- mpich2/trunk/src/pm/hydra/tools/topo/hwloc/hwloc/Makefile.am 2012-12-10 03:23:44 UTC (rev 10739) +++ mpich2/trunk/src/pm/hydra/tools/topo/hwloc/hwloc/Makefile.am 2012-12-10 03:23:54 UTC (rev 10740) @@ -9,10 +9,10 @@ SUBDIRS = src include if HWLOC_BUILD_STANDALONE -SUBDIRS += utils tests +# SUBDIRS += utils tests # We need doc/ if HWLOC_BUILD_DOXYGEN, or during make install if HWLOC_INSTALL_DOXYGEN. # There's no INSTALL_SUBDIRS, so always enter doc/ and check HWLOC_BUILD/INSTALL_DOXYGEN there -SUBDIRS += doc +# SUBDIRS += doc endif # Do not let automake automatically add the non-standalone dirs to the Modified: mpich2/trunk/src/pm/hydra/tools/topo/hwloc/hwloc/autogen.sh =================================================================== --- mpich2/trunk/src/pm/hydra/tools/topo/hwloc/hwloc/autogen.sh 2012-12-10 03:23:44 UTC (rev 10739) +++ mpich2/trunk/src/pm/hydra/tools/topo/hwloc/hwloc/autogen.sh 2012-12-10 03:23:54 UTC (rev 10740) @@ -1,2 +1,2 @@ : -autoreconf -ivf +autoreconf ${autoreconf_args:"-ivf"} Modified: mpich2/trunk/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 =================================================================== --- mpich2/trunk/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 2012-12-10 03:23:44 UTC (rev 10739) +++ mpich2/trunk/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 2012-12-10 03:23:54 UTC (rev 10740) @@ -573,6 +573,16 @@ AC_CHECK_HEADERS([malloc.h]) AC_CHECK_FUNCS([getpagesize memalign posix_memalign]) + # when autoheader is run, it doesn't know about + # PAC_FUNC_NEEDS_DECL, so it doesn't generate an appropriate line + # in config.h.in. We need to fool it with a dummy AC_DEFINE(). + if false ; then + AC_DEFINE([NEEDS_GETPAGESIZE_DECL], 1, [Define to 1 if getpagesize needs a declaration]) + fi + if test $ac_cv_func_getpagesize = "yes" ; then + PAC_FUNC_NEEDS_DECL([#include <unistd.h>],getpagesize) + fi + AC_CHECK_HEADERS([sys/utsname.h]) AC_CHECK_FUNCS([uname]) Modified: mpich2/trunk/src/pm/hydra/tools/topo/hwloc/hwloc/configure.ac =================================================================== --- mpich2/trunk/src/pm/hydra/tools/topo/hwloc/hwloc/configure.ac 2012-12-10 03:23:44 UTC (rev 10739) +++ mpich2/trunk/src/pm/hydra/tools/topo/hwloc/hwloc/configure.ac 2012-12-10 03:23:54 UTC (rev 10740) @@ -176,6 +176,19 @@ #CPPFLAGS="$CPPFLAGS -I$HWLOC_top_builddir" AC_CONFIG_COMMANDS_PRE([LT_CONFIG_H=`expr "$LT_CONFIG_H" : '.*/\(.*\)'`]) +## 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 Modified: mpich2/trunk/src/pm/hydra/tools/topo/hwloc/hwloc/include/private/private.h =================================================================== --- mpich2/trunk/src/pm/hydra/tools/topo/hwloc/hwloc/include/private/private.h 2012-12-10 03:23:44 UTC (rev 10739) +++ mpich2/trunk/src/pm/hydra/tools/topo/hwloc/hwloc/include/private/private.h 2012-12-10 03:23:54 UTC (rev 10740) @@ -29,6 +29,10 @@ #endif #include <string.h> +#if defined(HAVE_GETPAGESIZE) && defined(NEEDS_GETPAGESIZE_DECL) +int getpagesize(void); +#endif + #ifdef HWLOC_HAVE_ATTRIBUTE_FORMAT # if HWLOC_HAVE_ATTRIBUTE_FORMAT # define __hwloc_attribute_format(type, str, arg) __attribute__((__format__(type, str, arg))) Modified: mpich2/trunk/src/pm/hydra/tools/topo/hwloc/hwloc/src/Makefile.am =================================================================== --- mpich2/trunk/src/pm/hydra/tools/topo/hwloc/hwloc/src/Makefile.am 2012-12-10 03:23:44 UTC (rev 10739) +++ mpich2/trunk/src/pm/hydra/tools/topo/hwloc/hwloc/src/Makefile.am 2012-12-10 03:23:54 UTC (rev 10740) @@ -136,7 +136,7 @@ # Installable library libhwloc_la_SOURCES = $(sources) -libhwloc_la_LDFLAGS = $(ldflags) -version-info $(libhwloc_so_version) $(HWLOC_LIBS) +libhwloc_la_LDFLAGS = $(ldflags) $(libhwloc_so_versionflags) $(HWLOC_LIBS) if HWLOC_HAVE_PLUGINS AM_CPPFLAGS += $(LTDLINCL)