From 730a1b80b28644f547c751ab27225f0924c3398e Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Tue, 17 Mar 2009 22:18:26 +0000 Subject: [PATCH] Roll in 1.3rc4, which includes a fix for a problem discovered by LANL that the test for Valgrind's macro was not strong enough and may therefore try to compile in valgrind support into PLPA even if your version of Valgrind was too old. This commit was SVN r20819. --- opal/mca/paffinity/linux/plpa/VERSION | 4 +- opal/mca/paffinity/linux/plpa/config/plpa.m4 | 2 +- opal/mca/paffinity/linux/plpa/configure | 63 +++++++++++--------- 3 files changed, 37 insertions(+), 32 deletions(-) diff --git a/opal/mca/paffinity/linux/plpa/VERSION b/opal/mca/paffinity/linux/plpa/VERSION index 59e6426e18..864aa028d6 100644 --- a/opal/mca/paffinity/linux/plpa/VERSION +++ b/opal/mca/paffinity/linux/plpa/VERSION @@ -16,7 +16,7 @@ release=0 # requirement is that it must be entirely printable ASCII characters # and have no white space. -greek=rc3 +greek=rc4 # If want_svn=1, then the SVN r number will be included in the overall # PLPA version number in some form. @@ -33,4 +33,4 @@ want_svn=0 # distribution tarball is being made from an SVN checkout, the value # of svn_r in this file is replaced with the output of "svnversion". -svn_r=r238 +svn_r=r241 diff --git a/opal/mca/paffinity/linux/plpa/config/plpa.m4 b/opal/mca/paffinity/linux/plpa/config/plpa.m4 index f15b59ce33..1fa3535abc 100644 --- a/opal/mca/paffinity/linux/plpa/config/plpa.m4 +++ b/opal/mca/paffinity/linux/plpa/config/plpa.m4 @@ -309,7 +309,7 @@ AC_DEFUN([_PLPA_INIT],[ [CPPFLAGS="$CPPFLAGS -I$with_valgrind/include"]) AC_CHECK_HEADERS([valgrind/valgrind.h], [AC_MSG_CHECKING([for VALGRIND_CHECK_MEM_IS_ADDRESSABLE]) - AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[ + AC_LINK_IFELSE(AC_LANG_PROGRAM([[ #include "valgrind/memcheck.h" ]], [[char buffer = 0xff; diff --git a/opal/mca/paffinity/linux/plpa/configure b/opal/mca/paffinity/linux/plpa/configure index c8fec9eb3b..9df411ebc8 100755 --- a/opal/mca/paffinity/linux/plpa/configure +++ b/opal/mca/paffinity/linux/plpa/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for plpa 1.3rc3. +# Generated by GNU Autoconf 2.63 for plpa 1.3rc4. # # Report bugs to . # @@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='plpa' PACKAGE_TARNAME='plpa' -PACKAGE_VERSION='1.3rc3' -PACKAGE_STRING='plpa 1.3rc3' +PACKAGE_VERSION='1.3rc4' +PACKAGE_STRING='plpa 1.3rc4' PACKAGE_BUGREPORT='http://www.open-mpi.org/community/help/' # Factoring default headers for most tests. @@ -1484,7 +1484,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures plpa 1.3rc3 to adapt to many kinds of systems. +\`configure' configures plpa 1.3rc4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1554,7 +1554,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of plpa 1.3rc3:";; + short | recursive ) echo "Configuration of plpa 1.3rc4:";; esac cat <<\_ACEOF @@ -1679,7 +1679,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -plpa configure 1.3rc3 +plpa configure 1.3rc4 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1693,7 +1693,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by plpa $as_me 1.3rc3, which was +It was created by plpa $as_me 1.3rc4, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2413,7 +2413,7 @@ fi # Define the identity of the package. PACKAGE='plpa' - VERSION='1.3rc3' + VERSION='1.3rc4' # Some tools Automake needs. @@ -5597,15 +5597,15 @@ char buffer = 0xff; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" $as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -5614,7 +5614,10 @@ $as_echo "$ac_try_echo") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } valgrind_happy=yes @@ -5628,7 +5631,9 @@ $as_echo "no" >&6; } $as_echo "$as_me: WARNING: Need Valgrind version 3.2.0 or later." >&2;} fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext, +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext, else { $as_echo "$as_me:$LINENO: WARNING: valgrind.h not found" >&5 @@ -6419,13 +6424,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:6422: $ac_compile\"" >&5) + (eval echo "\"\$as_me:6427: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:6425: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:6430: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:6428: output\"" >&5) + (eval echo "\"\$as_me:6433: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7630,7 +7635,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7633 "configure"' > conftest.$ac_ext + echo '#line 7638 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8935,11 +8940,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8938: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8943: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8942: \$? = $ac_status" >&5 + echo "$as_me:8947: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9274,11 +9279,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9277: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9282: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9281: \$? = $ac_status" >&5 + echo "$as_me:9286: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9379,11 +9384,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9382: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9387: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9386: \$? = $ac_status" >&5 + echo "$as_me:9391: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9434,11 +9439,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9437: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9442: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9441: \$? = $ac_status" >&5 + echo "$as_me:9446: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12234,7 +12239,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12237 "configure" +#line 12242 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12330,7 +12335,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12333 "configure" +#line 12338 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13006,7 +13011,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by plpa $as_me 1.3rc3, which was +This file was extended by plpa $as_me 1.3rc4, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13069,7 +13074,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -plpa config.status 1.3rc3 +plpa config.status 1.3rc4 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"