ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Per RFC, continue with build system renaming

Просмотр исходного кода 
This commit was SVN r31657.
Этот коммит содержится в:
Ralph Castain 2014-05-06 19:22:27 +00:00
родитель deb0c6bb9a
Коммит 4f4d9dcd28
5 изменённых файлов: 38 добавлений и 36 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
config/ompi_setup_cxx.m4
Просмотреть файл

@ -51,7 +51,7 @@ AC_DEFUN([OMPI_SETUP_CXX],[
AS_IF([test "$WANT_MPI_CXX_SUPPORT" = "1"], AS_IF([test "$WANT_MPI_CXX_SUPPORT" = "1"],
[OMPI_CXX_FIND_TEMPLATE_REPOSITORY [OMPI_CXX_FIND_TEMPLATE_REPOSITORY
OMPI_CXX_FIND_TEMPLATE_PARAMETERS OMPI_CXX_FIND_TEMPLATE_PARAMETERS
OMPI_CHECK_IDENT([CXX], [CXXFLAGS], [cc], [C++])]) OPAL_CHECK_IDENT([CXX], [CXXFLAGS], [cc], [C++])])
_OMPI_CXX_CHECK_BUILTIN _OMPI_CXX_CHECK_BUILTIN

15
config/opal_check_func_lib.m4
Просмотреть файл

@ -11,6 +11,7 @@ dnl University of Stuttgart. All rights reserved.
dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl Copyright (c) 2004-2005 The Regents of the University of California.
dnl All rights reserved. dnl All rights reserved.
dnl Copyright (c) 2010-2013 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2010-2013 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2014 Intel, Inc. All rights reserved.
dnl $COPYRIGHT$ dnl $COPYRIGHT$
dnl dnl
dnl Additional copyrights may follow dnl Additional copyrights may follow
@ -27,24 +28,24 @@ dnl
# LIBS is not modified. # LIBS is not modified.
AC_DEFUN([OPAL_CHECK_FUNC_LIB],[ AC_DEFUN([OPAL_CHECK_FUNC_LIB],[
OPAL_VAR_SCOPE_PUSH([LIBS_save]) OPAL_VAR_SCOPE_PUSH([LIBS_save])
AS_VAR_PUSHDEF([ompi_var], [ompi_cv_func_lib_$1_$2])dnl AS_VAR_PUSHDEF([opal_var], [opal_cv_func_lib_$1_$2])dnl
AC_CACHE_CHECK([if we need -l$2 for $1], AC_CACHE_CHECK([if we need -l$2 for $1],
ompi_var, opal_var,
[AC_LINK_IFELSE([AC_LANG_FUNC_LINK_TRY([$1])], [AC_LINK_IFELSE([AC_LANG_FUNC_LINK_TRY([$1])],
[AS_VAR_SET(ompi_var, "no")], [AS_VAR_SET(opal_var, "no")],
[LIBS_save="$LIBS" [LIBS_save="$LIBS"
LIBS="$LIBS -l$2" LIBS="$LIBS -l$2"
AC_LINK_IFELSE([AC_LANG_FUNC_LINK_TRY([$1])], AC_LINK_IFELSE([AC_LANG_FUNC_LINK_TRY([$1])],
[AS_VAR_SET(ompi_var, "yes")], [AS_VAR_SET(opal_var, "yes")],
[AS_VAR_SET(ompi_var, "not found")]) [AS_VAR_SET(opal_var, "not found")])
LIBS="$LIBS_save"])]) LIBS="$LIBS_save"])])
AS_VAR_IF(ompi_var, [yes], AS_VAR_IF(opal_var, [yes],
[LIBS="$LIBS -l$2"]) [LIBS="$LIBS -l$2"])
# see if we actually have $1. Use AC_CHECK_FUNCS so that it # see if we actually have $1. Use AC_CHECK_FUNCS so that it
# does the glibc "not implemented" check. Will use the current LIBS, # does the glibc "not implemented" check. Will use the current LIBS,
# so will check in -l$2 if we decided we needed it above # so will check in -l$2 if we decided we needed it above
AC_CHECK_FUNCS([$1], $3, $4) AC_CHECK_FUNCS([$1], $3, $4)
AS_VAR_POPDEF([ompi_var])dnl AS_VAR_POPDEF([opal_var])dnl
OPAL_VAR_SCOPE_POP OPAL_VAR_SCOPE_POP
]) ])

7
config/opal_check_icc.m4
Просмотреть файл

@ -10,6 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
dnl University of Stuttgart. All rights reserved. dnl University of Stuttgart. All rights reserved.
dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl Copyright (c) 2004-2005 The Regents of the University of California.
dnl All rights reserved. dnl All rights reserved.
dnl Copyright (c) 2014 Intel, Inc. All rights reserved.
dnl $COPYRIGHT$ dnl $COPYRIGHT$
dnl dnl
dnl Additional copyrights may follow dnl Additional copyrights may follow
@ -17,7 +18,7 @@ dnl
dnl $HEADER$ dnl $HEADER$
dnl dnl
AC_DEFUN([OMPI_CHECK_ICC_VARARGS],[ AC_DEFUN([OPAL_CHECK_ICC_VARARGS],[
dnl dnl
dnl On EM64T, icc-8.1 before version 8.1.027 segfaulted, since dnl On EM64T, icc-8.1 before version 8.1.027 segfaulted, since
dnl va_start was miscompiled... dnl va_start was miscompiled...
@ -45,9 +46,9 @@ int main ()
return 0; return 0;
} }
],[ompi_ac_icc_varargs=`test -f conftestval`],[ompi_ac_icc_varargs=1],[ompi_ac_icc_varargs=1]) ],[opal_ac_icc_varargs=`test -f conftestval`],[opal_ac_icc_varargs=1],[opal_ac_icc_varargs=1])
if test "$ompi_ac_icc_varargs" = "1"; then if test "$opal_ac_icc_varargs" = "1"; then
AC_MSG_WARN([*** Problem running configure test!]) AC_MSG_WARN([*** Problem running configure test!])
AC_MSG_WARN([*** Your icc-8.1 compiler seems to miscompile va_start!]) AC_MSG_WARN([*** Your icc-8.1 compiler seems to miscompile va_start!])
AC_MSG_WARN([*** Please upgrade compiler to at least version 8.1.027]) AC_MSG_WARN([*** Please upgrade compiler to at least version 8.1.027])

46
config/opal_check_ident.m4
Просмотреть файл

@ -13,34 +13,34 @@ dnl OPAL_$1_USE_IDENT
dnl OPAL_$1_USE_CONST_CHAR_IDENT dnl OPAL_$1_USE_CONST_CHAR_IDENT
dnl dnl
# OMPI_CHECK_IDENT(compiler-env, compiler-flags, # OPAL_CHECK_IDENT(compiler-env, compiler-flags,
# file-suffix, lang) Try to compile a source file containing # file-suffix, lang) Try to compile a source file containing
# a #pragma ident, and determine whether the ident was # a #pragma ident, and determine whether the ident was
# inserted into the resulting object file # inserted into the resulting object file
# ----------------------------------------------------------- # -----------------------------------------------------------
AC_DEFUN([OMPI_CHECK_IDENT], [ AC_DEFUN([OPAL_CHECK_IDENT], [
AC_MSG_CHECKING([for $4 ident string support]) AC_MSG_CHECKING([for $4 ident string support])
opal_pragma_ident_happy=0 opal_pragma_ident_happy=0
opal_ident_happy=0 opal_ident_happy=0
opal_static_const_char_happy=0 opal_static_const_char_happy=0
_OMPI_CHECK_IDENT( _OPAL_CHECK_IDENT(
[$1], [$2], [$3], [$1], [$2], [$3],
[[#]pragma ident], [], [[#]pragma ident], [],
[opal_pragma_ident_happy=1 [opal_pragma_ident_happy=1
ompi_message="[#]pragma ident"], opal_message="[#]pragma ident"],
_OMPI_CHECK_IDENT( _OPAL_CHECK_IDENT(
[$1], [$2], [$3], [$1], [$2], [$3],
[[#]ident], [], [[#]ident], [],
[opal_ident_happy=1 [opal_ident_happy=1
ompi_message="[#]ident"], opal_message="[#]ident"],
_OMPI_CHECK_IDENT( _OPAL_CHECK_IDENT(
[$1], [$2], [$3], [$1], [$2], [$3],
[[#]pragma comment(exestr, ], [)], [[#]pragma comment(exestr, ], [)],
[opal_pragma_comment_happy=1 [opal_pragma_comment_happy=1
ompi_message="[#]pragma comment"], opal_message="[#]pragma comment"],
[opal_static_const_char_happy=1 [opal_static_const_char_happy=1
ompi_message="static const char[[]]"]))) opal_message="static const char[[]]"])))
AC_DEFINE_UNQUOTED([OPAL_$1_USE_PRAGMA_IDENT], AC_DEFINE_UNQUOTED([OPAL_$1_USE_PRAGMA_IDENT],
[$opal_pragma_ident_happy], [Use #pragma ident strings for $4 files]) [$opal_pragma_ident_happy], [Use #pragma ident strings for $4 files])
@ -51,24 +51,24 @@ AC_DEFUN([OMPI_CHECK_IDENT], [
AC_DEFINE_UNQUOTED([OPAL_$1_USE_CONST_CHAR_IDENT], AC_DEFINE_UNQUOTED([OPAL_$1_USE_CONST_CHAR_IDENT],
[$opal_static_const_char_happy], [Use static const char[] strings for $4 files]) [$opal_static_const_char_happy], [Use static const char[] strings for $4 files])
AC_MSG_RESULT([$ompi_message]) AC_MSG_RESULT([$opal_message])
unset opal_pragma_ident_happy opal_ident_happy opal_static_const_char_happy ompi_message unset opal_pragma_ident_happy opal_ident_happy opal_static_const_char_happy opal_message
]) ])
# _OMPI_CHECK_IDENT(compiler-env, compiler-flags, # _OPAL_CHECK_IDENT(compiler-env, compiler-flags,
# file-suffix, header_prefix, header_suffix, action-if-success, action-if-fail) # file-suffix, header_prefix, header_suffix, action-if-success, action-if-fail)
# Try to compile a source file containing a #-style ident, # Try to compile a source file containing a #-style ident,
# and determine whether the ident was inserted into the # and determine whether the ident was inserted into the
# resulting object file # resulting object file
# ----------------------------------------------------------- # -----------------------------------------------------------
AC_DEFUN([_OMPI_CHECK_IDENT], [ AC_DEFUN([_OPAL_CHECK_IDENT], [
eval ompi_compiler="\$$1" eval opal_compiler="\$$1"
eval ompi_flags="\$$2" eval opal_flags="\$$2"
ompi_ident="string_not_coincidentally_inserted_by_the_compiler" opal_ident="string_not_coincidentally_inserted_by_the_compiler"
cat > conftest.$3 <<EOF cat > conftest.$3 <<EOF
$4 "$ompi_ident" $5 $4 "$opal_ident" $5
int main(int argc, char** argv); int main(int argc, char** argv);
int main(int argc, char** argv) { return 0; } int main(int argc, char** argv) { return 0; }
EOF EOF
@ -79,12 +79,12 @@ EOF
# resulting object file. If the ident is found in "strings" or # resulting object file. If the ident is found in "strings" or
# the grep succeeds, rule that we have this flavor of ident. # the grep succeeds, rule that we have this flavor of ident.
OPAL_LOG_COMMAND([$ompi_compiler $ompi_flags -c conftest.$3 -o conftest.${OBJEXT}], OPAL_LOG_COMMAND([$opal_compiler $opal_flags -c conftest.$3 -o conftest.${OBJEXT}],
[AS_IF([test -f conftest.${OBJEXT}], [AS_IF([test -f conftest.${OBJEXT}],
[ompi_output="`strings -a conftest.${OBJEXT} | grep $ompi_ident`" [opal_output="`strings -a conftest.${OBJEXT} | grep $opal_ident`"
grep $ompi_ident conftest.${OBJEXT} 2>&1 1>/dev/null grep $opal_ident conftest.${OBJEXT} 2>&1 1>/dev/null
ompi_status=$? opal_status=$?
AS_IF([test "$ompi_output" != "" -o "$ompi_status" = "0"], AS_IF([test "$opal_output" != "" -o "$opal_status" = "0"],
[$6], [$6],
[$7])], [$7])],
[OPAL_LOG_MSG([the failed program was:]) [OPAL_LOG_MSG([the failed program was:])
@ -92,6 +92,6 @@ EOF
$7] $7]
[$7])]) [$7])])
unset ompi_compiler ompi_flags ompi_output ompi_status unset opal_compiler opal_flags opal_output opal_status
rm -rf conftest.* conftest${EXEEXT} rm -rf conftest.* conftest${EXEEXT}
])dnl ])dnl

4
configure.ac
Просмотреть файл

@ -339,7 +339,7 @@ OMPI_INTERIX
# Does the compiler support "ident"-like constructs? # Does the compiler support "ident"-like constructs?
OMPI_CHECK_IDENT([CC], [CFLAGS], [c], [C]) OPAL_CHECK_IDENT([CC], [CFLAGS], [c], [C])
# #
# Check for some types # Check for some types
@ -520,7 +520,7 @@ fi
OPAL_VAR_SCOPE_POP OPAL_VAR_SCOPE_POP
if test "x$CC" = "xicc"; then if test "x$CC" = "xicc"; then
OMPI_CHECK_ICC_VARARGS OPAL_CHECK_ICC_VARARGS
fi fi
# If we want the profiling layer: # If we want the profiling layer: