Bring in PLPA v1.3rc3 (add a missing comma, which should fix compiling
issues at Sun). Sorry for the middle of the day configure change, but this should fix a compile break at Sun... This commit was SVN r20594.
Этот коммит содержится в:
Jeff Squyres
родитель
97a2296fdd
Коммит
ed22f9744e
@ -16,7 +16,7 @@ release=0
|
||||
# requirement is that it must be entirely printable ASCII characters
|
||||
# and have no white space.
|
||||
|
||||
greek=rc2
|
||||
greek=rc3
|
||||
|
||||
# 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=r235
|
||||
svn_r=r238
|
||||
|
||||
@ -317,7 +317,7 @@ AC_DEFUN([_PLPA_INIT],[
|
||||
[AC_MSG_RESULT([yes])
|
||||
valgrind_happy=yes],
|
||||
[AC_MSG_RESULT([no])
|
||||
AC_MSG_WARN([Need Valgrind version 3.2.0 or later.])]
|
||||
AC_MSG_WARN([Need Valgrind version 3.2.0 or later.])],
|
||||
[AC_MSG_RESULT([cross-compiling; assume yes...?])
|
||||
AC_MSG_WARN([PLPA will fail to compile if you do not have Valgrind version 3.2.0 or later])
|
||||
valgrind_happy=yes]),
|
||||
|
||||
53
opal/mca/paffinity/linux/plpa/configure
поставляемый
53
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.3rc2.
|
||||
# Generated by GNU Autoconf 2.63 for plpa 1.3rc3.
|
||||
#
|
||||
# Report bugs to <http://www.open-mpi.org/community/help/>.
|
||||
#
|
||||
@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='plpa'
|
||||
PACKAGE_TARNAME='plpa'
|
||||
PACKAGE_VERSION='1.3rc2'
|
||||
PACKAGE_STRING='plpa 1.3rc2'
|
||||
PACKAGE_VERSION='1.3rc3'
|
||||
PACKAGE_STRING='plpa 1.3rc3'
|
||||
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.3rc2 to adapt to many kinds of systems.
|
||||
\`configure' configures plpa 1.3rc3 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.3rc2:";;
|
||||
short | recursive ) echo "Configuration of plpa 1.3rc3:";;
|
||||
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.3rc2
|
||||
plpa configure 1.3rc3
|
||||
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.3rc2, which was
|
||||
It was created by plpa $as_me 1.3rc3, 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.3rc2'
|
||||
VERSION='1.3rc3'
|
||||
|
||||
|
||||
# Some tools Automake needs.
|
||||
@ -5626,11 +5626,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
|
||||
$as_echo "no" >&6; }
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: Need Valgrind version 3.2.0 or later." >&5
|
||||
$as_echo "$as_me: WARNING: Need Valgrind version 3.2.0 or later." >&2;}
|
||||
{ $as_echo "$as_me:$LINENO: result: cross-compiling; assume yes...?" >&5
|
||||
$as_echo "cross-compiling; assume yes...?" >&6; }
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: PLPA will fail to compile if you do not have Valgrind version 3.2.0 or later" >&5
|
||||
$as_echo "$as_me: WARNING: PLPA will fail to compile if you do not have Valgrind version 3.2.0 or later" >&2;}
|
||||
valgrind_happy=yes
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext,
|
||||
@ -6424,13 +6419,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:6427: $ac_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:6422: $ac_compile\"" >&5)
|
||||
(eval "$ac_compile" 2>conftest.err)
|
||||
cat conftest.err >&5
|
||||
(eval echo "\"\$as_me:6430: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
||||
(eval echo "\"\$as_me:6425: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
||||
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
|
||||
cat conftest.err >&5
|
||||
(eval echo "\"\$as_me:6433: output\"" >&5)
|
||||
(eval echo "\"\$as_me:6428: output\"" >&5)
|
||||
cat conftest.out >&5
|
||||
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
|
||||
lt_cv_nm_interface="MS dumpbin"
|
||||
@ -7635,7 +7630,7 @@ ia64-*-hpux*)
|
||||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 7638 "configure"' > conftest.$ac_ext
|
||||
echo '#line 7633 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@ -8940,11 +8935,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:8943: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:8938: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:8947: \$? = $ac_status" >&5
|
||||
echo "$as_me:8942: \$? = $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.
|
||||
@ -9279,11 +9274,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:9282: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:9277: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:9286: \$? = $ac_status" >&5
|
||||
echo "$as_me:9281: \$? = $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.
|
||||
@ -9384,11 +9379,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:9387: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:9382: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:9391: \$? = $ac_status" >&5
|
||||
echo "$as_me:9386: \$? = $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
|
||||
@ -9439,11 +9434,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:9442: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:9437: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:9446: \$? = $ac_status" >&5
|
||||
echo "$as_me:9441: \$? = $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
|
||||
@ -12239,7 +12234,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 12242 "configure"
|
||||
#line 12237 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -12335,7 +12330,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 12338 "configure"
|
||||
#line 12333 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -13011,7 +13006,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.3rc2, which was
|
||||
This file was extended by plpa $as_me 1.3rc3, which was
|
||||
generated by GNU Autoconf 2.63. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@ -13074,7 +13069,7 @@ Report bugs to <bug-autoconf@gnu.org>."
|
||||
_ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_version="\\
|
||||
plpa config.status 1.3rc2
|
||||
plpa config.status 1.3rc3
|
||||
configured by $0, generated by GNU Autoconf 2.63,
|
||||
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
||||
|
||||
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user