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 d207289628674edd0f4036f1745a1b97d6eaa403 (commit) via ea41f80f7807ea22599f3d6d7ed93ff791af342f (commit) via 350fe9b85399f00d4505864f4aba2c45f3df5e38 (commit) via 43bd72a48283612bd86cf8603ce99cb2104a64c8 (commit) from 5b7f9166920e16e02eeb2bc1c4153c9c9795eac0 (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/d207289628674edd0f4036f1745a1b97d6... commit d207289628674edd0f4036f1745a1b97d6eaa403 Author: Pavan Balaji <[email protected]> Date: Sun May 5 14:42:37 2013 -0500 Include stdio.h in the configure test for the definition of NULL. No reviewer. diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 b/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 index 2ffb4ad..564ede4 100644 --- a/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 +++ b/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 @@ -447,10 +447,16 @@ EOF]) # or other similar definitions. So while the symbols "sysctl" and # "sysctlbyname" might still be available in libc (which autoconf # checks for), they might not be actually usable. - AC_TRY_LINK([#include <sys/sysctl.h>], + AC_TRY_LINK([ + #include <stdio.h> + #include <sys/sysctl.h> + ], [return sysctl(NULL,0,NULL,NULL,NULL,0);], AC_DEFINE([HAVE_SYSCTL],[1],[Define to '1' if sysctl is present and usable])) - AC_TRY_LINK([#include <sys/sysctl.h>], + AC_TRY_LINK([ + #include <stdio.h> + #include <sys/sysctl.h> + ], [return sysctlbyname(NULL,NULL,NULL,NULL,0);], AC_DEFINE([HAVE_SYSCTLBYNAME],[1],[Define to '1' if sysctlbyname is present and usable])) http://git.mpich.org/mpich.git/commitdiff/ea41f80f7807ea22599f3d6d7ed93ff791... commit ea41f80f7807ea22599f3d6d7ed93ff791af342f Author: Pavan Balaji <[email protected]> Date: Sun May 5 14:31:01 2013 -0500 Include stdio.h in the configure test for getifaddrs. No reviewer. diff --git a/src/pm/hydra/configure.ac b/src/pm/hydra/configure.ac index 68289ec..46a980e 100644 --- a/src/pm/hydra/configure.ac +++ b/src/pm/hydra/configure.ac @@ -160,6 +160,7 @@ if test "$ac_cv_func_killpg" = "yes" ; then fi AC_TRY_LINK([ + #include <stdio.h> #include <sys/types.h> #include <ifaddrs.h> ], http://git.mpich.org/mpich.git/commitdiff/350fe9b85399f00d4505864f4aba2c45f3... commit 350fe9b85399f00d4505864f4aba2c45f3df5e38 Author: Pavan Balaji <[email protected]> Date: Sun May 5 14:22:19 2013 -0500 Simplify C89 header checks. We can assume that C89 headers exist. Just throw an error in hydra if the compiler can't even support that, though that shouldn't be necessary either. No reviewer. diff --git a/src/pm/hydra/configure.ac b/src/pm/hydra/configure.ac index 053e98d..68289ec 100644 --- a/src/pm/hydra/configure.ac +++ b/src/pm/hydra/configure.ac @@ -134,10 +134,10 @@ AC_SUBST(top_srcdir) PAC_ENABLE_COVERAGE # Check if the necessary headers are available -AC_CHECK_HEADERS(unistd.h stdlib.h string.h strings.h stdarg.h sys/types.h sys/socket.h \ - sched.h sys/stat.h sys/param.h netinet/in.h netinet/tcp.h \ - sys/un.h netdb.h sys/time.h time.h ifaddrs.h arpa/inet.h \ - errno.h poll.h fcntl.h netdb.h winsock2.h windows.h signal.h) +AC_HEADER_STDC +AC_CHECK_HEADERS(unistd.h strings.h sys/types.h sys/socket.h sched.h sys/stat.h sys/param.h \ + netinet/in.h netinet/tcp.h sys/un.h netdb.h sys/time.h time.h ifaddrs.h arpa/inet.h \ + poll.h fcntl.h netdb.h winsock2.h windows.h) AC_CHECK_LIB(socket,socket,LDFLAGS="$LDFLAGS -lsocket",) AC_CHECK_LIB(nsl,gethostbyname,LDFLAGS="$LDFLAGS -lnsl",) diff --git a/src/pm/hydra/include/hydra.h b/src/pm/hydra/include/hydra.h index adfcdeb..491a2e9 100644 --- a/src/pm/hydra/include/hydra.h +++ b/src/pm/hydra/include/hydra.h @@ -18,7 +18,17 @@ extern char *HYD_dbg_prefix; +/* C89 headers can be included without a check */ +#if defined STDC_HEADERS #include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <stdarg.h> +#include <errno.h> +#include <signal.h> +#else +#error "STDC_HEADERS are assumed in the Hydra code" +#endif /* STDC_HEADERS */ #if defined NEEDS_POSIX_FOR_SIGACTION #define _POSIX_SOURCE @@ -33,22 +43,10 @@ extern char *HYD_dbg_prefix; #include <unistd.h> #endif /* HAVE_UNISTD_H */ -#if defined HAVE_STDLIB_H -#include <stdlib.h> -#endif /* HAVE_STDLIB_H */ - -#if defined HAVE_STRING_H -#include <string.h> -#endif /* HAVE_STRING_H */ - #if defined HAVE_STRINGS_H #include <strings.h> #endif /* HAVE_STRINGS_H */ -#if defined HAVE_STDARG_H -#include <stdarg.h> -#endif /* HAVE_STDARG_H */ - #if defined HAVE_SYS_TYPES_H #include <sys/types.h> #endif /* HAVE_SYS_TYPES_H */ @@ -73,10 +71,6 @@ extern char *HYD_dbg_prefix; #include <arpa/inet.h> #endif /* HAVE_ARPA_INET_H */ -#if defined HAVE_ERRNO_H -#include <errno.h> -#endif /* HAVE_ERRNO_H */ - #if !defined HAVE_GETTIMEOFDAY #error "hydra requires gettimeofday support" #endif /* HAVE_GETTIMEOFDAY */ http://git.mpich.org/mpich.git/commitdiff/43bd72a48283612bd86cf8603ce99cb210... commit 43bd72a48283612bd86cf8603ce99cb2104a64c8 Author: Pavan Balaji <[email protected]> Date: Sun May 5 13:47:02 2013 -0500 Die on autoreconf error instead of chugging along. No reviewer. diff --git a/src/pm/hydra/autogen.sh b/src/pm/hydra/autogen.sh index 51306b9..b84ab3b 100755 --- a/src/pm/hydra/autogen.sh +++ b/src/pm/hydra/autogen.sh @@ -8,9 +8,12 @@ fi echo "=== running autoreconf in 'mpl' ===" (cd mpl && $autoreconf ${autoreconf_args:-"-vif"}) || exit 1 + echo "=== running autoreconf in 'tools/topo/hwloc/hwloc' ===" (cd tools/topo/hwloc/hwloc && $autoreconf ${autoreconf_args:-"-vif"}) || exit 1 -$autoreconf ${autoreconf_args:-"-vif"} + +echo "=== running autoreconf in '.' ===" +$autoreconf ${autoreconf_args:-"-vif"} || exit 1 # Remove the autom4te.cache folders for a release-like structure. find . -name autom4te.cache | xargs rm -rf ----------------------------------------------------------------------- Summary of changes: src/pm/hydra/autogen.sh | 5 +++- src/pm/hydra/configure.ac | 9 ++++--- src/pm/hydra/include/hydra.h | 26 +++++++------------ .../hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 | 10 ++++++- 4 files changed, 27 insertions(+), 23 deletions(-) hooks/post-receive -- MPICH primary repository