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

The final step of the RFC: convert the <foo>libdir and friends to fit their respective code areas, and equate them all at the top. Note that we can't entirely separate things as the opal_install_dirs framework can't handle separated locations for the various trees.

Просмотр исходного кода 
This commit was SVN r31679.
Этот коммит содержится в:
Ralph Castain 2014-05-08 02:01:35 +00:00
родитель a8e2d6c3a6
Коммит 11faab1091
170 изменённых файлов: 355 добавлений и 325 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
Makefile.ompi-rules
Просмотреть файл

@ -13,6 +13,8 @@
@ sed -e 's/#PACKAGE_NAME#/@PACKAGE_NAME@/g' \
-e 's/#PACKAGE_VERSION#/@PACKAGE_VERSION@/g' \
-e 's/#OMPI_DATE#/@OMPI_RELEASE_DATE@/g' \
-e 's/#OPAL_DATE#/@OMPI_RELEASE_DATE@/g' \
-e 's/#ORTE_DATE#/@OMPI_RELEASE_DATE@/g' \
> $@ < $<
.3in.3:
@ -20,6 +22,8 @@
@ sed -e 's/#PACKAGE_NAME#/@PACKAGE_NAME@/g' \
-e 's/#PACKAGE_VERSION#/@PACKAGE_VERSION@/g' \
-e 's/#OMPI_DATE#/@OMPI_RELEASE_DATE@/g' \
-e 's/#OPAL_DATE#/@OMPI_RELEASE_DATE@/g' \
-e 's/#ORTE_DATE#/@OMPI_RELEASE_DATE@/g' \
> $@ < $<
.7in.7:
@ -27,6 +31,8 @@
@ sed -e 's/#PACKAGE_NAME#/@PACKAGE_NAME@/g' \
-e 's/#PACKAGE_VERSION#/@PACKAGE_VERSION@/g' \
-e 's/#OMPI_DATE#/@OMPI_RELEASE_DATE@/g' \
-e 's/#OPAL_DATE#/@OMPI_RELEASE_DATE@/g' \
-e 's/#ORTE_DATE#/@OMPI_RELEASE_DATE@/g' \
> $@ < $<
# A little verbosity magic; "make" will show the terse output. "make

14
autogen.pl
Просмотреть файл

@ -259,17 +259,17 @@ sub mca_process_component {
sub ignored {
my ($dir) = @_;
# If this directory does not have .ompi_ignore, or if it has a
# .ompi_unignore that has my username in it, then add it to the
# If this directory does not have .opal_ignore, or if it has a
# .opal_unignore that has my username in it, then add it to the
# list of components.
my $ignored = 0;
if (-f "$dir/.ompi_ignore") {
if (-f "$dir/.opal_ignore") {
$ignored = 1;
}
if (-f "$dir/.ompi_unignore") {
open(UNIGNORE, "$dir/.ompi_unignore") ||
my_die "Can't open $dir/.ompi_unignore file";
if (-f "$dir/.opal_unignore") {
open(UNIGNORE, "$dir/.opal_unignore") ||
my_die "Can't open $dir/.opal_unignore file";
my $unignore;
$unignore .= $_
while (<UNIGNORE>);
@ -353,7 +353,7 @@ sub mca_process_framework {
# Check ignore status
if (ignored("$dir/$d")) {
verbose " => Ignored (found .ompi_ignore file)\n";
verbose " => Ignored (found .opal_ignore file)\n";
} else {
mca_process_component($topdir, $project, $framework, $d);
}

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

@ -9,7 +9,8 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
dnl University of Stuttgart. All rights reserved.
dnl Copyright (c) 2004-2005 The Regents of the University of California.
dnl All rights reserved.
dnl Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2014 Intel, Inc. All rights reserved.
dnl $COPYRIGHT$
dnl
dnl Additional copyrights may follow
@ -28,8 +29,8 @@ dnl not calling AC_SUBST on them).
# ********************************************************************
AC_DEFUN([OMPI_INTL_PTHREAD_TRY_LINK], [
# BEGIN: OMPI_INTL_PTHREAD_TRY_LINK
AC_DEFUN([OPAL_INTL_PTHREAD_TRY_LINK], [
# BEGIN: OPAL_INTL_PTHREAD_TRY_LINK
#
# Make sure that we can run a small application in C or C++, which
# ever is the current language. Do make sure that C or C++ is the
@ -64,12 +65,12 @@ int main(int argc, char* argv[])
return 0;
}]])],
[$1], [$2])
# END: OMPI_INTL_PTHREAD_TRY_LINK
# END: OPAL_INTL_PTHREAD_TRY_LINK
])dnl
AC_DEFUN([OMPI_INTL_PTHREAD_TRY_LINK_FORTRAN], [
# BEGIN: OMPI_INTL_PTHREAD_TRY_LINK_FORTRAN
AC_DEFUN([OPAL_INTL_PTHREAD_TRY_LINK_FORTRAN], [
# BEGIN: OPAL_INTL_PTHREAD_TRY_LINK_FORTRAN
#
# Make sure that we can run a small application in Fortran, with
# pthreads living in a C object file
@ -83,15 +84,15 @@ EOF
# C module
if test -f conftest.h; then
ompi_conftest_h="#include \"conftest.h\""
opal_conftest_h="#include \"conftest.h\""
else
ompi_conftest_h=""
opal_conftest_h=""
fi
cat > conftest.c <<EOF
#include <stdio.h>
#include <stdlib.h>
#include <pthread.h>
$ompi_conftest_h
$opal_conftest_h
#ifdef __cplusplus
extern "C" {
@ -158,9 +159,9 @@ else
$2
fi
unset HAPPY ompi_conftest_h
unset HAPPY opal_conftest_h
rm -rf conftest*
# END: OMPI_INTL_PTHREAD_TRY_LINK_FORTRAN
# END: OPAL_INTL_PTHREAD_TRY_LINK_FORTRAN
])dnl
@ -169,11 +170,11 @@ rm -rf conftest*
# Try to compile thread support without any special flags
#
# ********************************************************************
AC_DEFUN([OMPI_INTL_POSIX_THREADS_PLAIN_C], [
AC_DEFUN([OPAL_INTL_POSIX_THREADS_PLAIN_C], [
#
# C compiler
#
if test "$ompi_pthread_c_success" = "0"; then
if test "$opal_pthread_c_success" = "0"; then
AC_MSG_CHECKING([if C compiler and POSIX threads work as is])
if test "$HAVE_POSIX_THREADS" = "1" ; then
run_this_test=1
@ -202,10 +203,10 @@ if test "$ompi_pthread_c_success" = "0"; then
if test "$run_this_test" = "1" ; then
AC_LANG_PUSH(C)
OMPI_INTL_PTHREAD_TRY_LINK(ompi_pthread_c_success=1,
ompi_pthread_c_success=0)
OPAL_INTL_PTHREAD_TRY_LINK(opal_pthread_c_success=1,
opal_pthread_c_success=0)
AC_LANG_POP(C)
if test "$ompi_pthread_c_success" = "1"; then
if test "$opal_pthread_c_success" = "1"; then
AC_MSG_RESULT([yes])
else
PTHREAD_CPPFLAGS=
@ -217,11 +218,11 @@ fi
])dnl
AC_DEFUN([OMPI_INTL_POSIX_THREADS_PLAIN_CXX], [
AC_DEFUN([OPAL_INTL_POSIX_THREADS_PLAIN_CXX], [
#
# C++ compiler
#
if test "$ompi_pthread_cxx_success" = "0"; then
if test "$opal_pthread_cxx_success" = "0"; then
AC_MSG_CHECKING([if C++ compiler and POSIX threads work as is])
if test "$HAVE_POSIX_THREADS" = "1" ; then
run_this_test=1
@ -250,10 +251,10 @@ if test "$ompi_pthread_cxx_success" = "0"; then
if test "$run_this_test" = "1" ; then
AC_LANG_PUSH(C++)
OMPI_INTL_PTHREAD_TRY_LINK(ompi_pthread_cxx_success=1,
ompi_pthread_cxx_success=0)
OPAL_INTL_PTHREAD_TRY_LINK(opal_pthread_cxx_success=1,
opal_pthread_cxx_success=0)
AC_LANG_POP(C++)
if test "$ompi_pthread_cxx_success" = "1"; then
if test "$opal_pthread_cxx_success" = "1"; then
AC_MSG_RESULT([yes])
else
PTHREAD_CXXCPPFLAGS=
@ -265,11 +266,11 @@ fi
])dnl
AC_DEFUN([OMPI_INTL_POSIX_THREADS_PLAIN_FC], [
AC_DEFUN([OPAL_INTL_POSIX_THREADS_PLAIN_FC], [
#
# Fortran compiler
#
if test "$ompi_pthread_fortran_success" = "0" -a "$OMPI_WANT_FORTRAN_BINDINGS" = "1" -a $ompi_fortran_happy -eq 1; then
if test "$opal_pthread_fortran_success" = "0" -a "$OMPI_WANT_FORTRAN_BINDINGS" = "1" -a $ompi_fortran_happy -eq 1; then
AC_MSG_CHECKING([if Fortran compiler and POSIX threads work as is])
if test "$HAVE_POSIX_THREADS" = "1" ; then
run_this_test=1
@ -287,10 +288,10 @@ if test "$ompi_pthread_fortran_success" = "0" -a "$OMPI_WANT_FORTRAN_BINDINGS" =
if test "$run_this_test" = "1" ; then
AC_LANG_PUSH(C)
OMPI_INTL_PTHREAD_TRY_LINK_FORTRAN(ompi_pthread_fortran_success=1,
ompi_pthread_fortran_success=0)
OPAL_INTL_PTHREAD_TRY_LINK_FORTRAN(opal_pthread_fortran_success=1,
opal_pthread_fortran_success=0)
AC_LANG_POP(C)
if test "$ompi_pthread_fortran_success" = "1"; then
if test "$opal_pthread_fortran_success" = "1"; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
@ -300,8 +301,8 @@ fi
])dnl
AC_DEFUN([OMPI_INTL_POSIX_THREADS_PLAIN], [
# BEGIN: OMPI_INTL_POSIX_THREADS_PLAIN
AC_DEFUN([OPAL_INTL_POSIX_THREADS_PLAIN], [
# BEGIN: OPAL_INTL_POSIX_THREADS_PLAIN
#
# Check if can compile without any special flags
# we throw -D_REENTRANT or -D_THREAD_SAFE in here, just in
@ -312,18 +313,18 @@ AC_DEFUN([OMPI_INTL_POSIX_THREADS_PLAIN], [
# Only run C++ and Fortran if those compilers already configured
AC_PROVIDE_IFELSE([AC_PROG_CC],
[OMPI_INTL_POSIX_THREADS_PLAIN_C],
[ompi_pthread_c_success=1])
[OPAL_INTL_POSIX_THREADS_PLAIN_C],
[opal_pthread_c_success=1])
AC_PROVIDE_IFELSE([AC_PROG_CXX],
[OMPI_INTL_POSIX_THREADS_PLAIN_CXX],
[ompi_pthread_cxx_success=1])
[OPAL_INTL_POSIX_THREADS_PLAIN_CXX],
[opal_pthread_cxx_success=1])
AC_PROVIDE_IFELSE([AC_PROG_FC],
[OMPI_INTL_POSIX_THREADS_PLAIN_FC],
[ompi_pthread_fortran_success=1])
[OPAL_INTL_POSIX_THREADS_PLAIN_FC],
[opal_pthread_fortran_success=1])
# End: OMPI_INTL_POSIX_THREADS_PLAIN
# End: OPAL_INTL_POSIX_THREADS_PLAIN
])dnl
@ -332,19 +333,19 @@ AC_PROVIDE_IFELSE([AC_PROG_FC],
# Try to compile thread support with special compiler flags
#
# ********************************************************************
AC_DEFUN([OMPI_INTL_POSIX_THREADS_SPECIAL_FLAGS_C], [
AC_DEFUN([OPAL_INTL_POSIX_THREADS_SPECIAL_FLAGS_C], [
#
# C compiler
#
if test "$ompi_pthread_c_success" = "0"; then
if test "$opal_pthread_c_success" = "0"; then
for pf in $pflags; do
AC_MSG_CHECKING([if C compiler and POSIX threads work with $pf])
CFLAGS="$orig_CFLAGS $pf"
AC_LANG_PUSH(C)
OMPI_INTL_PTHREAD_TRY_LINK(ompi_pthread_c_success=1,
ompi_pthread_c_success=0)
OPAL_INTL_PTHREAD_TRY_LINK(opal_pthread_c_success=1,
opal_pthread_c_success=0)
AC_LANG_POP(C)
if test "$ompi_pthread_c_success" = "1"; then
if test "$opal_pthread_c_success" = "1"; then
PTHREAD_CFLAGS="$pf"
AC_MSG_RESULT([yes])
break
@ -358,19 +359,19 @@ fi
])
AC_DEFUN([OMPI_INTL_POSIX_THREADS_SPECIAL_FLAGS_CXX], [
AC_DEFUN([OPAL_INTL_POSIX_THREADS_SPECIAL_FLAGS_CXX], [
#
# C++ compiler
#
if test "$ompi_pthread_cxx_success" = "0"; then
if test "$opal_pthread_cxx_success" = "0"; then
for pf in $pflags; do
AC_MSG_CHECKING([if C++ compiler and POSIX threads work with $pf])
CXXFLAGS="$orig_CXXFLAGS $pf"
AC_LANG_PUSH(C++)
OMPI_INTL_PTHREAD_TRY_LINK(ompi_pthread_cxx_success=1,
ompi_pthread_cxx_success=0)
OPAL_INTL_PTHREAD_TRY_LINK(opal_pthread_cxx_success=1,
opal_pthread_cxx_success=0)
AC_LANG_POP(C++)
if test "$ompi_pthread_cxx_success" = "1"; then
if test "$opal_pthread_cxx_success" = "1"; then
PTHREAD_CXXFLAGS="$pf"
AC_MSG_RESULT([yes])
break
@ -384,19 +385,19 @@ fi
])
AC_DEFUN([OMPI_INTL_POSIX_THREADS_SPECIAL_FLAGS_FC], [
AC_DEFUN([OPAL_INTL_POSIX_THREADS_SPECIAL_FLAGS_FC], [
#
# Fortran compiler
#
if test "$ompi_pthread_fortran_success" = "0" -a "$OMPI_WANT_FORTRAN_BINDINGS" = "1" -a $ompi_fortran_happy -eq 1; then
if test "$opal_pthread_fortran_success" = "0" -a "$OMPI_WANT_FORTRAN_BINDINGS" = "1" -a $ompi_fortran_happy -eq 1; then
for pf in $pflags; do
AC_MSG_CHECKING([if Fortran compiler and POSIX threads work with $pf])
FCFLAGS="$orig_FCFLAGS $pf"
AC_LANG_PUSH(C)
OMPI_INTL_PTHREAD_TRY_LINK_FORTRAN(ompi_pthread_fortran_success=1,
ompi_pthread_fortran_success=0)
OPAL_INTL_PTHREAD_TRY_LINK_FORTRAN(opal_pthread_fortran_success=1,
opal_pthread_fortran_success=0)
AC_LANG_POP(C)
if test "$ompi_pthread_fortran_success" = "1"; then
if test "$opal_pthread_fortran_success" = "1"; then
PTHREAD_FCFLAGS="$pf"
AC_MSG_RESULT([yes])
break
@ -410,8 +411,8 @@ fi
])
AC_DEFUN([OMPI_INTL_POSIX_THREADS_SPECIAL_FLAGS],[
# Begin: OMPI_INTL_POSIX_THREADS_SPECIAL_FLAGS
AC_DEFUN([OPAL_INTL_POSIX_THREADS_SPECIAL_FLAGS],[
# Begin: OPAL_INTL_POSIX_THREADS_SPECIAL_FLAGS
#
# If above didn't work, try some super-special compiler flags
# that get evaluated to the "right" things.
@ -438,18 +439,18 @@ esac
# Only run C++ and Fortran if those compilers already configured
AC_PROVIDE_IFELSE([AC_PROG_CC],
[OMPI_INTL_POSIX_THREADS_SPECIAL_FLAGS_C],
[ompi_pthread_c_success=1])
[OPAL_INTL_POSIX_THREADS_SPECIAL_FLAGS_C],
[opal_pthread_c_success=1])
AC_PROVIDE_IFELSE([AC_PROG_CXX],
[OMPI_INTL_POSIX_THREADS_SPECIAL_FLAGS_CXX],
[ompi_pthread_cxx_success=1])
[OPAL_INTL_POSIX_THREADS_SPECIAL_FLAGS_CXX],
[opal_pthread_cxx_success=1])
AC_PROVIDE_IFELSE([AC_PROG_FC],
[OMPI_INTL_POSIX_THREADS_SPECIAL_FLAGS_FC],
[ompi_pthread_fortran_success=1])
[OPAL_INTL_POSIX_THREADS_SPECIAL_FLAGS_FC],
[opal_pthread_fortran_success=1])
# End: OMPI_INTL_POSIX_THREADS_SPECIAL_FLAGS
# End: OPAL_INTL_POSIX_THREADS_SPECIAL_FLAGS
])dnl
@ -458,11 +459,11 @@ AC_PROVIDE_IFELSE([AC_PROG_FC],
# Try to compile thread support with extra libs
#
# ********************************************************************
AC_DEFUN([OMPI_INTL_POSIX_THREADS_LIBS_C],[
AC_DEFUN([OPAL_INTL_POSIX_THREADS_LIBS_C],[
#
# C compiler
#
if test "$ompi_pthread_c_success" = "0"; then
if test "$opal_pthread_c_success" = "0"; then
for pl in $plibs; do
AC_MSG_CHECKING([if C compiler and POSIX threads work with $pl])
case "${host_cpu}-${host-_os}" in
@ -481,10 +482,10 @@ if test "$ompi_pthread_c_success" = "0"; then
esac
LIBS="$orig_LIBS $pl"
AC_LANG_PUSH(C)
OMPI_INTL_PTHREAD_TRY_LINK(ompi_pthread_c_success=1,
ompi_pthread_c_success=0)
OPAL_INTL_PTHREAD_TRY_LINK(opal_pthread_c_success=1,
opal_pthread_c_success=0)
AC_LANG_POP(C)
if test "$ompi_pthread_c_success" = "1"; then
if test "$opal_pthread_c_success" = "1"; then
PTHREAD_LIBS="$pl"
AC_MSG_RESULT([yes])
else
@ -498,12 +499,12 @@ fi
])dnl
AC_DEFUN([OMPI_INTL_POSIX_THREADS_LIBS_CXX],[
AC_DEFUN([OPAL_INTL_POSIX_THREADS_LIBS_CXX],[
#
# C++ compiler
#
if test "$ompi_pthread_cxx_success" = "0"; then
if test ! "$ompi_pthread_c_success" = "0" -a ! "$PTHREAD_LIBS" = "" ; then
if test "$opal_pthread_cxx_success" = "0"; then
if test ! "$opal_pthread_c_success" = "0" -a ! "$PTHREAD_LIBS" = "" ; then
AC_MSG_CHECKING([if C++ compiler and POSIX threads work with $PTHREAD_LIBS])
case "${host_cpu}-${host-_os}" in
*-aix* | *-freebsd*)
@ -521,10 +522,10 @@ if test "$ompi_pthread_cxx_success" = "0"; then
esac
LIBS="$orig_LIBS $PTHREAD_LIBS"
AC_LANG_PUSH(C++)
OMPI_INTL_PTHREAD_TRY_LINK(ompi_pthread_cxx_success=1,
ompi_pthread_cxx_success=0)
OPAL_INTL_PTHREAD_TRY_LINK(opal_pthread_cxx_success=1,
opal_pthread_cxx_success=0)
AC_LANG_POP(C++)
if test "$ompi_pthread_cxx_success" = "1"; then
if test "$opal_pthread_cxx_success" = "1"; then
AC_MSG_RESULT([yes])
else
CXXCPPFLAGS="$orig_CXXCPPFLAGS"
@ -551,10 +552,10 @@ if test "$ompi_pthread_cxx_success" = "0"; then
esac
LIBS="$orig_LIBS $pl"
AC_LANG_PUSH(C++)
OMPI_INTL_PTHREAD_TRY_LINK(ompi_pthread_cxx_success=1,
ompi_pthread_cxx_success=0)
OPAL_INTL_PTHREAD_TRY_LINK(opal_pthread_cxx_success=1,
opal_pthread_cxx_success=0)
AC_LANG_POP(C++)
if test "$ompi_pthread_cxx_success" = "1"; then
if test "$opal_pthread_cxx_success" = "1"; then
PTHREAD_LIBS="$pl"
AC_MSG_RESULT([yes])
else
@ -569,19 +570,19 @@ fi
])dnl
AC_DEFUN([OMPI_INTL_POSIX_THREADS_LIBS_FC],[
AC_DEFUN([OPAL_INTL_POSIX_THREADS_LIBS_FC],[
#
# Fortran compiler
#
if test "$ompi_pthread_fortran_success" = "0" -a "$OMPI_WANT_FORTRAN_BINDINGS" = "1" -a $ompi_fortran_happy -eq 1; then
if test ! "$ompi_pthread_c_success" = "0" -a ! "$PTHREAD_LIBS" = "" ; then
if test "$opal_pthread_fortran_success" = "0" -a "$OMPI_WANT_FORTRAN_BINDINGS" = "1" -a $ompi_fortran_happy -eq 1; then
if test ! "$opal_pthread_c_success" = "0" -a ! "$PTHREAD_LIBS" = "" ; then
AC_MSG_CHECKING([if Fortran compiler and POSIX threads work with $PTHREAD_LIBS])
LIBS="$orig_LIBS $PTHREAD_LIBS"
AC_LANG_PUSH(C)
OMPI_INTL_PTHREAD_TRY_LINK_FORTRAN(ompi_pthread_fortran_success=1,
ompi_pthread_fortran_success=0)
OPAL_INTL_PTHREAD_TRY_LINK_FORTRAN(opal_pthread_fortran_success=1,
opal_pthread_fortran_success=0)
AC_LANG_POP(C)
if test "$ompi_pthread_fortran_success" = "1"; then
if test "$opal_pthread_fortran_success" = "1"; then
AC_MSG_RESULT([yes])
else
LIBS="$orig_LIBS"
@ -593,10 +594,10 @@ if test "$ompi_pthread_fortran_success" = "0" -a "$OMPI_WANT_FORTRAN_BINDINGS" =
AC_MSG_CHECKING([if Fortran compiler and POSIX threads work with $pl])
LIBS="$orig_LIBS $pl"
AC_LANG_PUSH(C)
OMPI_INTL_PTHREAD_TRY_LINK_FORTRAN(ompi_pthread_fortran_success=1,
ompi_pthread_fortran_success=0)
OPAL_INTL_PTHREAD_TRY_LINK_FORTRAN(opal_pthread_fortran_success=1,
opal_pthread_fortran_success=0)
AC_LANG_POP(C)
if test "$ompi_pthread_fortran_success" = "1"; then
if test "$opal_pthread_fortran_success" = "1"; then
PTHREAD_LIBS="$pl"
AC_MSG_RESULT([yes])
break
@ -610,8 +611,8 @@ fi
])dnl
AC_DEFUN([OMPI_INTL_POSIX_THREADS_LIBS],[
# Begin: OMPI_INTL_POSIX_THREADS_LIBS
AC_DEFUN([OPAL_INTL_POSIX_THREADS_LIBS],[
# Begin: OPAL_INTL_POSIX_THREADS_LIBS
#
# if we can't find a super-special compiler flags, try some libraries.
# we throw -D_REENTRANT or -D_THREAD_SAFE in here, just in case. Some
@ -625,18 +626,18 @@ plibs="-lpthreads -llthread -lpthread"
# Only run C++ and Fortran if those compilers already configured
AC_PROVIDE_IFELSE([AC_PROG_CC],
[OMPI_INTL_POSIX_THREADS_LIBS_C],
[ompi_pthread_c_success=1])
[OPAL_INTL_POSIX_THREADS_LIBS_C],
[opal_pthread_c_success=1])
AC_PROVIDE_IFELSE([AC_PROG_CXX],
[OMPI_INTL_POSIX_THREADS_LIBS_CXX],
[ompi_pthread_cxx_success=1])
[OPAL_INTL_POSIX_THREADS_LIBS_CXX],
[opal_pthread_cxx_success=1])
AC_PROVIDE_IFELSE([AC_PROG_FC],
[OMPI_INTL_POSIX_THREADS_LIBS_FC],
[ompi_pthread_fortran_success=1])
[OPAL_INTL_POSIX_THREADS_LIBS_FC],
[opal_pthread_fortran_success=1])
# End: OMPI_INTL_POSIX_THREADS_LIBS]
# End: OPAL_INTL_POSIX_THREADS_LIBS]
)dnl
@ -648,9 +649,9 @@ AC_PROVIDE_IFELSE([AC_PROG_FC],
AC_DEFUN([OPAL_CONFIG_POSIX_THREADS],[
AC_REQUIRE([AC_PROG_GREP])
ompi_pthread_c_success=0
ompi_pthread_fortran_success=0
ompi_pthread_cxx_success=0
opal_pthread_c_success=0
opal_pthread_fortran_success=0
opal_pthread_cxx_success=0
orig_CFLAGS="$CFLAGS"
orig_FCFLAGS="$FCFLAGS"
@ -669,13 +670,13 @@ PTHREAD_LDFLAGS=
PTHREAD_LIBS=
# Try with the basics, mam.
OMPI_INTL_POSIX_THREADS_PLAIN
OPAL_INTL_POSIX_THREADS_PLAIN
# Try the super-special compiler flags.
OMPI_INTL_POSIX_THREADS_SPECIAL_FLAGS
OPAL_INTL_POSIX_THREADS_SPECIAL_FLAGS
# Try the normal linking methods (that's no fun)
OMPI_INTL_POSIX_THREADS_LIBS
OPAL_INTL_POSIX_THREADS_LIBS
#
# check to see if we can create shared memory mutexes and conditions
@ -694,7 +695,7 @@ AC_LINK_IFELSE(
[[pthread_mutexattr_settype(NULL, PTHREAD_MUTEX_ERRORCHECK_NP);]])],
[result="yes" defval=1], [result="no" defval=0])
AC_MSG_RESULT([$result])
AC_DEFINE_UNQUOTED([OMPI_HAVE_PTHREAD_MUTEX_ERRORCHECK_NP], [$defval],
AC_DEFINE_UNQUOTED([OPAL_HAVE_PTHREAD_MUTEX_ERRORCHECK_NP], [$defval],
[If PTHREADS implementation supports PTHREAD_MUTEX_ERRORCHECK_NP])
# Mac OS X
@ -705,7 +706,7 @@ AC_LINK_IFELSE(
[[pthread_mutexattr_settype(NULL, PTHREAD_MUTEX_ERRORCHECK);]])],
[result="yes" defval=1], [result="no" defval=0])
AC_MSG_RESULT([$result])
AC_DEFINE_UNQUOTED([OMPI_HAVE_PTHREAD_MUTEX_ERRORCHECK], [$defval],
AC_DEFINE_UNQUOTED([OPAL_HAVE_PTHREAD_MUTEX_ERRORCHECK], [$defval],
[If PTHREADS implementation supports PTHREAD_MUTEX_ERRORCHECK])
CFLAGS="$orig_CFLAGS"
@ -717,12 +718,12 @@ LDFLAGS="$orig_LDFLAGS"
LIBS="$orig_LIBS"
if test "$OMPI_WANT_FORTRAN_BINDINGS" != "1" -o $ompi_fortran_happy -ne 1; then
ompi_pthread_fortran_success=1
opal_pthread_fortran_success=1
fi
if test "$ompi_pthread_c_success" = "1" -a \
"$ompi_pthread_cxx_success" = "1" -a \
"$ompi_pthread_fortran_success" = "1"; then
if test "$opal_pthread_c_success" = "1" -a \
"$opal_pthread_cxx_success" = "1" -a \
"$opal_pthread_fortran_success" = "1"; then
internal_useless=1
$1
else
@ -730,6 +731,6 @@ else
$2
fi
unset ompi_pthread_c_success ompi_pthread_fortran_success ompi_pthread_cxx_success
unset opal_pthread_c_success opal_pthread_fortran_success opal_pthread_cxx_success
unset internal_useless
])dnl

9
config/opal_get_version.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 All rights reserved.
dnl Copyright (c) 2008-2011 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2014 Intel, Inc. All rights reserved.
dnl $COPYRIGHT$
dnl
dnl Additional copyrights may follow
@ -37,13 +38,13 @@ dnl
# prefix_REPO_REV
# prefix_RELEASE_DATE
m4_define([OPAL_GET_VERSION],[
: ${ompi_ver_need_repo_rev=1}
: ${opal_ver_need_repo_rev=1}
: ${svnversion_result=-1}
dnl quote eval to suppress macro expansion with non-GNU m4
if test -f "$1"; then
srcdir=`dirname $1`
ompi_vers=`sed -n "
opal_vers=`sed -n "
t clear
: clear
s/^major/$2_MAJOR_VERSION/
@ -57,7 +58,7 @@ m4_define([OPAL_GET_VERSION],[
b
: print
p" < "$1"`
[eval] "$ompi_vers"
[eval] "$opal_vers"
# Only print release version if it isn't 0
if test $$2_RELEASE_VERSION -ne 0 ; then
@ -68,7 +69,7 @@ m4_define([OPAL_GET_VERSION],[
$2_VERSION="${$2_VERSION}${$2_GREEK_VERSION}"
$2_BASE_VERSION=$$2_VERSION
if test $$2_WANT_REPO_REV -eq 1 && test $ompi_ver_need_repo_rev -eq 1 ; then
if test $$2_WANT_REPO_REV -eq 1 && test $opal_ver_need_repo_rev -eq 1 ; then
if test "$svnversion_result" != "-1" ; then
$2_REPO_REV=$svnversion_result
fi

4
config/opal_get_version.m4sh
Просмотреть файл

@ -30,10 +30,10 @@ option="$2"
case "$option" in
# svnversion can take a while to run. If we don't need it, don't run it.
--major|--minor|--release|--greek|--base|--help)
ompi_ver_need_repo_rev=0
opal_ver_need_repo_rev=0
;;
*)
ompi_ver_need_repo_rev=1
opal_ver_need_repo_rev=1
esac

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

@ -1401,16 +1401,38 @@ case "`uname`" in
;;
esac
# ompidatadir, ompilibdir, and ompiinclude are essentially the same as
# opaldatadir, opallibdir, and opalinclude are essentially the same as
# pkg*dir, but will always be */openmpi. This is to make it a bit
# easier to deal with the problem of opal, orte, and ompi built from
# their own tarballs, with their own PACKAGE variables.
ompidatadir='${datadir}/openmpi'
ompilibdir='${libdir}/openmpi'
ompiincludedir='${includedir}/openmpi'
AC_SUBST(ompidatadir)
AC_SUBST(ompilibdir)
AC_SUBST(ompiincludedir)
opaldatadir='${datadir}/openmpi'
opallibdir='${libdir}/openmpi'
opalincludedir='${includedir}/openmpi'
AC_SUBST(opaldatadir)
AC_SUBST(opallibdir)
AC_SUBST(opalincludedir)
m4_ifdef([project_orte],
[ortedatadir="$opaldatadir"
AC_SUBST(ortedatadir)
ortelibdir="$opallibdir"
AC_SUBST(ortelibdir)
orteincludedir="$opalincludedir"
AC_SUBST(orteincludedir)])
m4_ifdef([project_ompi],
[ompidatadir="$opaldatadir"
AC_SUBST(ompidatadir)
ompilibdir="$opallibdir"
AC_SUBST(ompilibdir)
ompiincludedir="$opalincludedir"
AC_SUBST(ompiincludedir)])
m4_ifdef([project_oshmem],
[oshmemdatadir="$opaldatadir"
AC_SUBST(oshmemdatadir)
oshmemlibdir="$opallibdir"
AC_SUBST(oshmemlibdir)
oshmemincludedir="$opalincludedir"
AC_SUBST(oshmemincludedir)])
opal_show_subtitle "Final output"

2
ompi/debuggers/ompi_debuggers.c
Просмотреть файл

@ -168,7 +168,7 @@ ompi_debugger_setup_dlls(void)
int i;
char **dirs, **tmp1 = NULL, **tmp2 = NULL;
ompi_debugger_dll_path = opal_install_dirs.ompilibdir;
ompi_debugger_dll_path = opal_install_dirs.opallibdir;
(void) mca_base_var_register("ompi", "ompi", "debugger", "dll_path",
"List of directories where MPI_INIT should search for debugger plugins",
MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,

2
ompi/mca/coll/ml/coll_ml_mca.c
Просмотреть файл

@ -278,7 +278,7 @@ int mca_coll_ml_register_params(void)
OBJ_RELEASE(new_enum);
asprintf(&str, "%s/mca-coll-ml.config",
opal_install_dirs.ompidatadir);
opal_install_dirs.opaldatadir);
if (NULL == str) {
return OMPI_ERR_OUT_OF_RESOURCE;
}

2
opal/Makefile.am
Просмотреть файл

@ -67,7 +67,7 @@ libopen_pal_la_SOURCES += $(headers)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
opaldir = $(ompiincludedir)/$(subdir)
opaldir = $(opalincludedir)/$(subdir)
nobase_opal_HEADERS = $(headers)
# This is somewhat of a hack -- libltdl is installed by libtoolize,

2
opal/datatype/Makefile.am
Просмотреть файл

@ -69,7 +69,7 @@ libdatatype_la_LIBADD = libdatatype_reliable.la
# Conditionally install the header files
if WANT_INSTALL_HEADERS
opaldir = $(ompiincludedir)/$(subdir)
opaldir = $(opalincludedir)/$(subdir)
opal_HEADERS = $(headers)
endif

2
opal/include/Makefile.am
Просмотреть файл

@ -29,7 +29,7 @@ include opal/Makefile.am
EXTRA_DIST = $(headers)
if WANT_INSTALL_HEADERS
opaldir = $(ompiincludedir)
opaldir = $(opalincludedir)
nobase_dist_opal_HEADERS = $(headers)
nobase_nodist_opal_HEADERS = $(nodist_headers)
endif

2
opal/mca/backtrace/Makefile.am
Просмотреть файл

@ -27,7 +27,7 @@ libmca_backtrace_la_SOURCES += $(headers)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
opaldir = $(ompiincludedir)/$(subdir)
opaldir = $(opalincludedir)/$(subdir)
nobase_opal_HEADERS = $(headers)
endif

2
opal/mca/base/Makefile.am
Просмотреть файл

@ -64,6 +64,6 @@ libmca_base_la_SOURCES = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
opaldir = $(ompiincludedir)/$(subdir)
opaldir = $(opalincludedir)/$(subdir)
opal_HEADERS = $(headers)
endif

4
opal/mca/base/mca_base_open.c
Просмотреть файл

@ -75,10 +75,10 @@ int mca_base_open(void)
/* define the system and user default paths */
#if OPAL_WANT_HOME_CONFIG_FILES
mca_base_system_default_path = strdup(opal_install_dirs.ompilibdir);
mca_base_system_default_path = strdup(opal_install_dirs.opallibdir);
asprintf(&mca_base_user_default_path, "%s"OPAL_PATH_SEP".openmpi"OPAL_PATH_SEP"components", opal_home_directory());
#else
asprintf(&mca_base_system_default_path, "%s", opal_install_dirs.ompilibdir);
asprintf(&mca_base_system_default_path, "%s", opal_install_dirs.opallibdir);
#endif
/* see if the user wants to override the defaults */

2
opal/mca/base/mca_base_var.c
Просмотреть файл

@ -339,7 +339,7 @@ static int mca_base_var_cache_files(bool rel_path_search)
MCA_BASE_VAR_SCOPE_READONLY, &mca_base_var_file_prefix);
ret = asprintf(&mca_base_param_file_path, "%s" OPAL_PATH_SEP "amca-param-sets%c%s",
opal_install_dirs.ompidatadir, OPAL_ENV_SEP, cwd);
opal_install_dirs.opaldatadir, OPAL_ENV_SEP, cwd);
if (0 > ret) {
return OPAL_ERR_OUT_OF_RESOURCE;
}

2
opal/mca/compress/Makefile.am
Просмотреть файл

@ -25,7 +25,7 @@ $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
# Conditionally install the header files
if WANT_INSTALL_HEADERS
opaldir = $(ompiincludedir)/$(subdir)
opaldir = $(opalincludedir)/$(subdir)
nobase_opal_HEADERS = $(headers)
endif

2
opal/mca/compress/bzip/Makefile.am
Просмотреть файл

@ -29,7 +29,7 @@ component_noinst = libmca_compress_bzip.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(opallibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_compress_bzip_la_SOURCES = $(sources)
mca_compress_bzip_la_LDFLAGS = -module -avoid-version

2
opal/mca/compress/gzip/Makefile.am
Просмотреть файл

@ -29,7 +29,7 @@ component_noinst = libmca_compress_gzip.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(opallibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_compress_gzip_la_SOURCES = $(sources)
mca_compress_gzip_la_LDFLAGS = -module -avoid-version

2
opal/mca/crs/Makefile.am
Просмотреть файл

@ -39,7 +39,7 @@ $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
# Conditionally install the header files
if WANT_INSTALL_HEADERS
opaldir = $(ompiincludedir)/$(subdir)
opaldir = $(opalincludedir)/$(subdir)
nobase_opal_HEADERS = $(headers)
endif

2
opal/mca/crs/blcr/Makefile.am
Просмотреть файл

@ -37,7 +37,7 @@ component_noinst = libmca_crs_blcr.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(opallibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_crs_blcr_la_SOURCES = $(sources)
mca_crs_blcr_la_LDFLAGS = -module -avoid-version $(crs_blcr_LDFLAGS)

2
opal/mca/crs/criu/Makefile.am
Просмотреть файл

@ -37,7 +37,7 @@ component_noinst = libmca_crs_criu.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(opallibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_crs_criu_la_SOURCES = $(sources)
mca_crs_criu_la_LDFLAGS = -module -avoid-version $(crs_criu_LDFLAGS)

2
opal/mca/crs/dmtcp/Makefile.am
Просмотреть файл

@ -29,7 +29,7 @@ component_noinst = libmca_crs_dmtcp.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(opallibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_crs_dmtcp_la_SOURCES = $(sources)
mca_crs_dmtcp_la_LDFLAGS = -module -avoid-version $(crs_dmtcp_LDFLAGS)

2
opal/mca/crs/none/Makefile.am
Просмотреть файл

@ -33,7 +33,7 @@ component_noinst = libmca_crs_none.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(opallibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_crs_none_la_SOURCES = $(sources)
mca_crs_none_la_LDFLAGS = -module -avoid-version

2
opal/mca/crs/self/Makefile.am
Просмотреть файл

@ -37,7 +37,7 @@ component_noinst = libmca_crs_self.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(opallibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_crs_self_la_SOURCES = $(sources)
mca_crs_self_la_LDFLAGS = -module -avoid-version

2
opal/mca/dstore/Makefile.am
Просмотреть файл

@ -22,7 +22,7 @@ libmca_dstore_la_SOURCES += $(headers)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
opaldir = $(ompiincludedir)/$(subdir)
opaldir = $(opalincludedir)/$(subdir)
nobase_opal_HEADERS = $(headers)
endif

2
opal/mca/dstore/hash/Makefile.am
Просмотреть файл

@ -25,7 +25,7 @@ component_noinst = libmca_dstore_hash.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(opallibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_dstore_hash_la_SOURCES = $(sources)
mca_dstore_hash_la_LDFLAGS = -module -avoid-version

2
opal/mca/dstore/pmi/Makefile.am
Просмотреть файл

@ -24,7 +24,7 @@ component_noinst = libmca_dstore_pmi.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(opallibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_dstore_pmi_la_SOURCES = $(sources)
mca_dstore_pmi_la_CPPFLAGS = $(dstore_pmi_CPPFLAGS)

2
opal/mca/event/Makefile.am
Просмотреть файл

@ -17,7 +17,7 @@ libmca_event_la_SOURCES += $(headers)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
opaldir = $(ompiincludedir)/$(subdir)
opaldir = $(opalincludedir)/$(subdir)
nobase_opal_HEADERS = $(headers)
endif

2
opal/mca/event/libevent2021/Makefile.am
Просмотреть файл

@ -61,7 +61,7 @@ headers += libevent/opal_rename.h libevent/event.h libevent/evutil.h libevent/ut
libevent/include/event2/tag.h \
libevent/include/event2/thread.h \
libevent/include/event2/util.h
opaldir = $(ompiincludedir)/$(subdir)
opaldir = $(opalincludedir)/$(subdir)
nobase_opal_HEADERS = $(headers)
nobase_nodist_opal_HEADERS = libevent/include/event2/event-config.h

2
opal/mca/hwloc/Makefile.am
Просмотреть файл

@ -17,7 +17,7 @@ libmca_hwloc_la_SOURCES += $(headers)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
opaldir = $(ompiincludedir)/$(subdir)
opaldir = $(opalincludedir)/$(subdir)
nobase_opal_HEADERS = $(headers)
endif

2
opal/mca/hwloc/hwloc172/Makefile.am
Просмотреть файл

@ -61,7 +61,7 @@ endif HWLOC_HAVE_SCHED_SETAFFINITY
# Conditionally install the header files
if WANT_INSTALL_HEADERS
opaldir = $(ompiincludedir)/$(subdir)
opaldir = $(opalincludedir)/$(subdir)
nobase_opal_HEADERS = $(headers)
nobase_nodist_opal_HEADERS = $(nodist_headers)
endif

2
opal/mca/if/Makefile.am
Просмотреть файл

@ -17,7 +17,7 @@ libmca_if_la_SOURCES += $(headers)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
opaldir = $(ompiincludedir)/opal/mca/if
opaldir = $(opalincludedir)/opal/mca/if
nobase_opal_HEADERS = $(headers)
endif

2
opal/mca/installdirs/Makefile.am
Просмотреть файл

@ -19,7 +19,7 @@ libmca_installdirs_la_SOURCES += $(headers)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
opaldir = $(ompiincludedir)/$(subdir)
opaldir = $(opalincludedir)/$(subdir)
nobase_opal_HEADERS = $(headers)
endif

24
opal/mca/installdirs/base/installdirs_base_components.c
Просмотреть файл

@ -74,11 +74,11 @@ opal_installdirs_base_open(mca_base_open_flag_t flags)
CONDITIONAL_COPY(opal_install_dirs, component->install_dirs_data,
mandir);
CONDITIONAL_COPY(opal_install_dirs, component->install_dirs_data,
ompidatadir);
opaldatadir);
CONDITIONAL_COPY(opal_install_dirs, component->install_dirs_data,
ompilibdir);
opallibdir);
CONDITIONAL_COPY(opal_install_dirs, component->install_dirs_data,
ompiincludedir);
opalincludedir);
}
/* expand out all the fields */
@ -110,12 +110,12 @@ opal_installdirs_base_open(mca_base_open_flag_t flags)
opal_install_dirs_expand_setup(opal_install_dirs.infodir);
opal_install_dirs.mandir =
opal_install_dirs_expand_setup(opal_install_dirs.mandir);
opal_install_dirs.ompidatadir =
opal_install_dirs_expand_setup(opal_install_dirs.ompidatadir);
opal_install_dirs.ompilibdir =
opal_install_dirs_expand_setup(opal_install_dirs.ompilibdir);
opal_install_dirs.ompiincludedir =
opal_install_dirs_expand_setup(opal_install_dirs.ompiincludedir);
opal_install_dirs.opaldatadir =
opal_install_dirs_expand_setup(opal_install_dirs.opaldatadir);
opal_install_dirs.opallibdir =
opal_install_dirs_expand_setup(opal_install_dirs.opallibdir);
opal_install_dirs.opalincludedir =
opal_install_dirs_expand_setup(opal_install_dirs.opalincludedir);
#if 0
fprintf(stderr, "prefix: %s\n", opal_install_dirs.prefix);
@ -161,9 +161,9 @@ opal_installdirs_base_close(void)
free(opal_install_dirs.includedir);
free(opal_install_dirs.infodir);
free(opal_install_dirs.mandir);
free(opal_install_dirs.ompidatadir);
free(opal_install_dirs.ompilibdir);
free(opal_install_dirs.ompiincludedir);
free(opal_install_dirs.opaldatadir);
free(opal_install_dirs.opallibdir);
free(opal_install_dirs.opalincludedir);
return mca_base_framework_components_close (&opal_installdirs_base_framework, NULL);
}

6
opal/mca/installdirs/base/installdirs_base_expand.c
Просмотреть файл

@ -141,9 +141,9 @@ opal_install_dirs_expand_internal(const char* input, bool is_setup)
EXPAND_STRING(includedir);
EXPAND_STRING(infodir);
EXPAND_STRING(mandir);
EXPAND_STRING2(ompidatadir, pkgdatadir);
EXPAND_STRING2(ompilibdir, pkglibdir);
EXPAND_STRING2(ompiincludedir, pkgincludedir);
EXPAND_STRING2(opaldatadir, pkgdatadir);
EXPAND_STRING2(opallibdir, pkglibdir);
EXPAND_STRING2(opalincludedir, pkgincludedir);
} while (changed);
}

6
opal/mca/installdirs/config/install_dirs.h.in
Просмотреть файл

@ -76,7 +76,7 @@
/* $(datadir)/package-name/. You probably want to use this instead of
OPAL_DATADIR */
#define OPAL_PKGDATADIR "@ompidatadir@"
#define OPAL_PKGDATADIR "@opaldatadir@"
/* The directory for installing read-only data files that pertain to a
single machine–that is to say, files for configuring a host. Mailer
@ -109,14 +109,14 @@
#define OPAL_LIBDIR "@libdir@"
/* $(libdir)/package-name/. This is where components should go */
#define OPAL_PKGLIBDIR "@ompilibdir@"
#define OPAL_PKGLIBDIR "@opallibdir@"
/* The directory for installing header files to be included by user
programs with the C ‘#include’ preprocessor directive. */
#define OPAL_INCLUDEDIR "@includedir@"
/* $(includedir)/package-name/. The devel headers go in here */
#define OPAL_PKGINCLUDEDIR "@ompiincludedir@"
#define OPAL_PKGINCLUDEDIR "@opalincludedir@"
/* The directory for installing the Info files for this package. */
#define OPAL_INFODIR "@infodir@"

6
opal/mca/installdirs/env/opal_installdirs_env.c поставляемый
Просмотреть файл

@ -75,9 +75,9 @@ installdirs_env_open(void)
SET_FIELD(includedir, "OPAL_INCLUDEDIR");
SET_FIELD(infodir, "OPAL_INFODIR");
SET_FIELD(mandir, "OPAL_MANDIR");
SET_FIELD(ompidatadir, "OPAL_PKGDATADIR");
SET_FIELD(ompilibdir, "OPAL_PKGLIBDIR");
SET_FIELD(ompiincludedir, "OPAL_PKGINCLUDEDIR");
SET_FIELD(opaldatadir, "OPAL_PKGDATADIR");
SET_FIELD(opallibdir, "OPAL_PKGLIBDIR");
SET_FIELD(opalincludedir, "OPAL_PKGINCLUDEDIR");
return OPAL_SUCCESS;
}

8
opal/mca/installdirs/installdirs.h
Просмотреть файл

@ -53,10 +53,10 @@ struct opal_install_dirs_t {
Note that these field names match macros set by configure that
are used in Makefile.am files. E.g., project help files are
installed into $(ompidatadir). */
char* ompidatadir;
char* ompilibdir;
char* ompiincludedir;
installed into $(opaldatadir). */
char* opaldatadir;
char* opallibdir;
char* opalincludedir;
};
typedef struct opal_install_dirs_t opal_install_dirs_t;

2
opal/mca/memchecker/Makefile.am
Просмотреть файл

@ -19,7 +19,7 @@ libmca_memchecker_la_SOURCES += $(headers)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
opaldir = $(ompiincludedir)/$(subdir)
opaldir = $(opalincludedir)/$(subdir)
nobase_opal_HEADERS = $(headers)
endif

2
opal/mca/memcpy/Makefile.am
Просмотреть файл

@ -21,7 +21,7 @@ libmca_memcpy_la_SOURCES += $(headers)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
opaldir = $(ompiincludedir)/$(subdir)
opaldir = $(opalincludedir)/$(subdir)
nobase_opal_HEADERS = $(headers)
nobase_nodist_opal_HEADERS = $(nodist_headers)
endif

2
opal/mca/memory/Makefile.am
Просмотреть файл

@ -27,7 +27,7 @@ libmca_memory_la_SOURCES += $(headers)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
opaldir = $(ompiincludedir)/$(subdir)
opaldir = $(opalincludedir)/$(subdir)
nobase_opal_HEADERS = $(headers)
endif

2
opal/mca/memory/linux/Makefile.am
Просмотреть файл

@ -32,7 +32,7 @@ AM_CPPFLAGS += -I$(srcdir)/sysdeps/generic
# software. So install it in the same place that we install ROMIO's
# copyright notices.
docdir = $(ompidatadir)/doc
docdir = $(opaldatadir)/doc
doc_DATA = COPYRIGHT-ptmalloc2.txt
# Help file

2
opal/mca/pstat/Makefile.am
Просмотреть файл

@ -27,7 +27,7 @@ libmca_pstat_la_SOURCES += $(headers)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
opaldir = $(ompiincludedir)/$(subdir)
opaldir = $(opalincludedir)/$(subdir)
nobase_opal_HEADERS = $(headers)
endif

2
opal/mca/pstat/linux/Makefile.am
Просмотреть файл

@ -34,7 +34,7 @@ component_noinst = libmca_pstat_linux.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(opallibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_pstat_linux_la_SOURCES = $(sources)
mca_pstat_linux_la_LDFLAGS = -module -avoid-version

2
opal/mca/pstat/test/Makefile.am
Просмотреть файл

@ -34,7 +34,7 @@ component_noinst = libmca_pstat_test.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(opallibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_pstat_test_la_SOURCES = $(sources)
mca_pstat_test_la_LDFLAGS = -module -avoid-version

2
opal/mca/sec/Makefile.am
Просмотреть файл

@ -22,7 +22,7 @@ libmca_sec_la_SOURCES += $(headers)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
opaldir = $(ompiincludedir)/$(subdir)
opaldir = $(opalincludedir)/$(subdir)
nobase_opal_HEADERS = $(headers)
endif

2
opal/mca/sec/basic/Makefile.am
Просмотреть файл

@ -24,7 +24,7 @@ component_noinst = libmca_sec_basic.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(opallibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_sec_basic_la_SOURCES = $(sources)
mca_sec_basic_la_LDFLAGS = -module -avoid-version

2
opal/mca/sec/keystone/Makefile.am
Просмотреть файл

@ -24,7 +24,7 @@ component_noinst = libmca_sec_keystone.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(opallibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_sec_keystone_la_SOURCES = $(sources)
mca_sec_keystone_la_LDFLAGS = -module -avoid-version

2
opal/mca/shmem/Makefile.am
Просмотреть файл

@ -29,7 +29,7 @@ libmca_shmem_la_SOURCES += $(headers)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
opaldir = $(ompiincludedir)/$(subdir)
opaldir = $(opalincludedir)/$(subdir)
nobase_opal_HEADERS = $(headers)
endif

2
opal/mca/shmem/mmap/Makefile.am
Просмотреть файл

@ -39,7 +39,7 @@ endif
# help file
dist_ompidata_DATA = help-opal-shmem-mmap.txt
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(opallibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_shmem_mmap_la_SOURCES = $(sources)
mca_shmem_mmap_la_LDFLAGS = -module -avoid-version

2
opal/mca/shmem/posix/Makefile.am
Просмотреть файл

@ -37,7 +37,7 @@ component_noinst = libmca_shmem_posix.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(opallibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_shmem_posix_la_SOURCES = $(sources)
mca_shmem_posix_la_LDFLAGS = -module -avoid-version

2
opal/mca/shmem/sysv/Makefile.am
Просмотреть файл

@ -35,7 +35,7 @@ component_noinst = libmca_shmem_sysv.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(opallibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_shmem_sysv_la_SOURCES = $(sources)
mca_shmem_sysv_la_LDFLAGS = -module -avoid-version

2
opal/mca/timer/Makefile.am
Просмотреть файл

@ -28,7 +28,7 @@ libmca_timer_la_SOURCES += $(headers)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
opaldir = $(ompiincludedir)/$(subdir)
opaldir = $(opalincludedir)/$(subdir)
nobase_opal_HEADERS = $(headers)
nobase_nodist_opal_HEADERS = $(nodist_headers)
endif

14
opal/runtime/opal_info_support.c
Просмотреть файл

@ -361,7 +361,7 @@ void opal_info_do_path(bool want_all, opal_cmd_line_t *cmd_line)
opal_info_show_path(opal_info_path_libdir, opal_install_dirs.libdir);
opal_info_show_path(opal_info_path_incdir, opal_install_dirs.includedir);
opal_info_show_path(opal_info_path_mandir, opal_install_dirs.mandir);
opal_info_show_path(opal_info_path_pkglibdir, opal_install_dirs.ompilibdir);
opal_info_show_path(opal_info_path_pkglibdir, opal_install_dirs.opallibdir);
opal_info_show_path(opal_info_path_libexecdir, opal_install_dirs.libexecdir);
opal_info_show_path(opal_info_path_datarootdir, opal_install_dirs.datarootdir);
opal_info_show_path(opal_info_path_datadir, opal_install_dirs.datadir);
@ -369,9 +369,9 @@ void opal_info_do_path(bool want_all, opal_cmd_line_t *cmd_line)
opal_info_show_path(opal_info_path_sharedstatedir, opal_install_dirs.sharedstatedir);
opal_info_show_path(opal_info_path_localstatedir, opal_install_dirs.localstatedir);
opal_info_show_path(opal_info_path_infodir, opal_install_dirs.infodir);
opal_info_show_path(opal_info_path_pkgdatadir, opal_install_dirs.ompidatadir);
opal_info_show_path(opal_info_path_pkglibdir, opal_install_dirs.ompilibdir);
opal_info_show_path(opal_info_path_pkgincludedir, opal_install_dirs.ompiincludedir);
opal_info_show_path(opal_info_path_pkgdatadir, opal_install_dirs.opaldatadir);
opal_info_show_path(opal_info_path_pkglibdir, opal_install_dirs.opallibdir);
opal_info_show_path(opal_info_path_pkgincludedir, opal_install_dirs.opalincludedir);
} else {
count = opal_cmd_line_get_ninsts(cmd_line, "path");
for (i = 0; i < count; ++i) {
@ -388,7 +388,7 @@ void opal_info_do_path(bool want_all, opal_cmd_line_t *cmd_line)
} else if (0 == strcmp(opal_info_path_mandir, scope)) {
opal_info_show_path(opal_info_path_mandir, opal_install_dirs.mandir);
} else if (0 == strcmp(opal_info_path_pkglibdir, scope)) {
opal_info_show_path(opal_info_path_pkglibdir, opal_install_dirs.ompilibdir);
opal_info_show_path(opal_info_path_pkglibdir, opal_install_dirs.opallibdir);
} else if (0 == strcmp(opal_info_path_sysconfdir, scope)) {
opal_info_show_path(opal_info_path_sysconfdir, opal_install_dirs.sysconfdir);
} else if (0 == strcmp(opal_info_path_exec_prefix, scope)) {
@ -408,9 +408,9 @@ void opal_info_do_path(bool want_all, opal_cmd_line_t *cmd_line)
} else if (0 == strcmp(opal_info_path_infodir, scope)) {
opal_info_show_path(opal_info_path_infodir, opal_install_dirs.infodir);
} else if (0 == strcmp(opal_info_path_pkgdatadir, scope)) {
opal_info_show_path(opal_info_path_pkgdatadir, opal_install_dirs.ompidatadir);
opal_info_show_path(opal_info_path_pkgdatadir, opal_install_dirs.opaldatadir);
} else if (0 == strcmp(opal_info_path_pkgincludedir, scope)) {
opal_info_show_path(opal_info_path_pkgincludedir, opal_install_dirs.ompiincludedir);
opal_info_show_path(opal_info_path_pkgincludedir, opal_install_dirs.opalincludedir);
} else {
char *usage = opal_cmd_line_get_usage_msg(cmd_line);
opal_show_help("help-opal_info.txt", "usage", true, usage);

6
opal/threads/mutex.c
Просмотреть файл

@ -39,11 +39,11 @@ static void opal_mutex_construct(opal_mutex_t *m)
pthread_mutexattr_init(&attr);
/* set type to ERRORCHECK so that we catch recursive locks */
#if OMPI_HAVE_PTHREAD_MUTEX_ERRORCHECK_NP
#if OPAL_HAVE_PTHREAD_MUTEX_ERRORCHECK_NP
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP);
#elif OMPI_HAVE_PTHREAD_MUTEX_ERRORCHECK
#elif OPAL_HAVE_PTHREAD_MUTEX_ERRORCHECK
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
#endif /* OMPI_HAVE_PTHREAD_MUTEX_ERRORCHECK_NP */
#endif /* OPAL_HAVE_PTHREAD_MUTEX_ERRORCHECK_NP */
pthread_mutex_init(&m->m_lock_pthread, &attr);
pthread_mutexattr_destroy(&attr);

2
opal/tools/opal-checkpoint/opal-checkpoint.1in
Просмотреть файл

@ -7,7 +7,7 @@
.\" Man page for OPAL's opal-checkpoint command
.\"
.\" .TH name section center-footer left-footer center-header
.TH OPAL-CHECKPOINT 1 "#OMPI_DATE#" "#PACKAGE_NAME#" "#PACKAGE_VERSION#"
.TH OPAL-CHECKPOINT 1 "#OPAL_DATE#" "#PACKAGE_NAME#" "#PACKAGE_VERSION#"
.\" **************************
.\" Name Section
.\" **************************

6
opal/tools/opal-restart/opal-restart.1in
Просмотреть файл

@ -7,7 +7,7 @@
.\" Man page for OPAL's opal-restart command
.\"
.\" .TH name section center-footer left-footer center-header
.TH OPAL-RESTART 1 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
.TH OPAL-RESTART 1 "#OPAL_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
.\" **************************
.\" Name Section
.\" **************************
@ -99,8 +99,8 @@ replaced by the name of the program to be restarted followed by any arguments
that need to be passed to the program. For example, if under normal execution
we would start our program "foo" as:
\fBshell$\fP setenv OMPI_MCA_crs=self
\fBshell$\fP setenv OMPI_MCA_crs_self_prefix=my_callback_prefix
\fBshell$\fP setenv OPAL_MCA_crs=self
\fBshell$\fP setenv OPAL_MCA_crs_self_prefix=my_callback_prefix
\fBshell$\fP ./foo arg1 arg2
To restart this process, we may only need to call:

2
opal/tools/wrappers/generic_wrapper.1in
Просмотреть файл

@ -1,6 +1,6 @@
.\" Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved.
.\" Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
.TH #COMMAND# 1 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
.TH #COMMAND# 1 "#OPAL_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
.
.SH NAME
#COMMAND# -- #PROJECT# #LANGUAGE# wrapper compiler

2
opal/tools/wrappers/opal_wrapper.1in
Просмотреть файл

@ -1,7 +1,7 @@
.\" Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved.
.\" Man page contributed by Dirk Eddelbuettel <edd@debian.org>
.\" and released under the BSD license
.TH OPAL_WRAPPER 1 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
.TH OPAL_WRAPPER 1 "#OPAL_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
.SH NAME
opal_wrapper - Back-end Open MPI wrapper command
.SH SYNOPSIS

2
opal/tools/wrappers/opal_wrapper.c
Просмотреть файл

@ -344,7 +344,7 @@ data_init(const char *appname)
/* now load the data */
asprintf(&datafile, "%s%s%s-wrapper-data.txt",
opal_install_dirs.ompidatadir, OPAL_PATH_SEP, appname);
opal_install_dirs.opaldatadir, OPAL_PATH_SEP, appname);
if (NULL == datafile) return OPAL_ERR_TEMP_OUT_OF_RESOURCE;
ret = opal_util_keyval_parse(datafile, data_callback);

2
opal/util/Makefile.am
Просмотреть файл

@ -110,6 +110,6 @@ libopalutil_la_DEPENDENCIES = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
opaldir = $(ompiincludedir)/$(subdir)
opaldir = $(opalincludedir)/$(subdir)
opal_HEADERS = $(headers)
endif

2
opal/util/show_help.c
Просмотреть файл

@ -62,7 +62,7 @@ int opal_show_help_init(void)
lds.lds_want_stderr = true;
output_stream = opal_output_open(&lds);
opal_argv_append_nosize(&search_dirs, opal_install_dirs.ompidatadir);
opal_argv_append_nosize(&search_dirs, opal_install_dirs.opaldatadir);
return OPAL_SUCCESS;
}

2
orte/Makefile.am
Просмотреть файл

@ -50,7 +50,7 @@ libopen_rte_la_SOURCES += $(headers)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
ortedir = $(ompiincludedir)/$(subdir)
ortedir = $(orteincludedir)/$(subdir)
nobase_orte_HEADERS = $(headers)
endif

2
orte/include/Makefile.am
Просмотреть файл

@ -27,7 +27,7 @@ include orte/Makefile.am
EXTRA_DIST = $(headers)
if WANT_INSTALL_HEADERS
ortedir = $(ompiincludedir)
ortedir = $(orteincludedir)
nobase_dist_orte_HEADERS = $(headers)
nobase_nodist_orte_HEADERS = $(nodist_headers)
endif

2
orte/mca/dfs/Makefile.am
Просмотреть файл

@ -17,7 +17,7 @@ libmca_dfs_la_SOURCES += $(headers)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
ortedir = $(ompiincludedir)/$(subdir)
ortedir = $(orteincludedir)/$(subdir)
nobase_orte_HEADERS = $(headers)
endif

2
orte/mca/dfs/app/Makefile.am
Просмотреть файл

@ -24,7 +24,7 @@ component_noinst = libmca_dfs_app.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_dfs_app_la_SOURCES = $(sources)
mca_dfs_app_la_LDFLAGS = -module -avoid-version

2
orte/mca/dfs/orted/Makefile.am
Просмотреть файл

@ -24,7 +24,7 @@ component_noinst = libmca_dfs_orted.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_dfs_orted_la_SOURCES = $(sources)
mca_dfs_orted_la_LDFLAGS = -module -avoid-version

2
orte/mca/dfs/test/Makefile.am
Просмотреть файл

@ -24,7 +24,7 @@ component_noinst = libmca_dfs_test.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_dfs_test_la_SOURCES = $(sources)
mca_dfs_test_la_LDFLAGS = -module -avoid-version

2
orte/mca/errmgr/Makefile.am
Просмотреть файл

@ -30,7 +30,7 @@ dist_ompidata_DATA =
# Conditionally install the header files
if WANT_INSTALL_HEADERS
ortedir = $(ompiincludedir)/$(subdir)
ortedir = $(orteincludedir)/$(subdir)
nobase_orte_HEADERS = $(headers)
endif

2
orte/mca/errmgr/default_app/Makefile.am
Просмотреть файл

@ -24,7 +24,7 @@ component_noinst = libmca_errmgr_default_app.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_errmgr_default_app_la_SOURCES = $(sources)
mca_errmgr_default_app_la_LDFLAGS = -module -avoid-version

2
orte/mca/errmgr/default_hnp/Makefile.am
Просмотреть файл

@ -24,7 +24,7 @@ component_noinst = libmca_errmgr_default_hnp.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_errmgr_default_hnp_la_SOURCES = $(sources)
mca_errmgr_default_hnp_la_LDFLAGS = -module -avoid-version

2
orte/mca/errmgr/default_orted/Makefile.am
Просмотреть файл

@ -24,7 +24,7 @@ component_noinst = libmca_errmgr_default_orted.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_errmgr_default_orted_la_SOURCES = $(sources)
mca_errmgr_default_orted_la_LDFLAGS = -module -avoid-version

2
orte/mca/errmgr/default_tool/Makefile.am
Просмотреть файл

@ -24,7 +24,7 @@ component_noinst = libmca_errmgr_default_tool.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_errmgr_default_tool_la_SOURCES = $(sources)
mca_errmgr_default_tool_la_LDFLAGS = -module -avoid-version

2
orte/mca/ess/Makefile.am
Просмотреть файл

@ -32,7 +32,7 @@ libmca_ess_la_SOURCES += $(headers)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
ortedir = $(ompiincludedir)/$(subdir)
ortedir = $(orteincludedir)/$(subdir)
nobase_orte_HEADERS = $(headers)
endif

2
orte/mca/ess/alps/Makefile.am
Просмотреть файл

@ -34,7 +34,7 @@ component_noinst = libmca_ess_alps.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_ess_alps_la_SOURCES = $(sources)
mca_ess_alps_la_LDFLAGS = -module -avoid-version

2
orte/mca/ess/env/Makefile.am поставляемый
Просмотреть файл

@ -34,7 +34,7 @@ component_noinst = libmca_ess_env.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_ess_env_la_SOURCES = $(sources)
mca_ess_env_la_LDFLAGS = -module -avoid-version

2
orte/mca/ess/hnp/Makefile.am
Просмотреть файл

@ -34,7 +34,7 @@ component_noinst = libmca_ess_hnp.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_ess_hnp_la_SOURCES = $(sources)
mca_ess_hnp_la_LDFLAGS = -module -avoid-version

2
orte/mca/ess/lsf/Makefile.am
Просмотреть файл

@ -36,7 +36,7 @@ component_noinst = libmca_ess_lsf.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_ess_lsf_la_SOURCES = $(sources)
mca_ess_lsf_la_LDFLAGS = -module -avoid-version $(ess_lsf_LDFLAGS)

2
orte/mca/ess/pmi/Makefile.am
Просмотреть файл

@ -28,7 +28,7 @@ component_noinst = libmca_ess_pmi.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_ess_pmi_la_SOURCES = $(sources)
mca_ess_pmi_la_LDFLAGS = -module -avoid-version $(ess_pmi_LDFLAGS)

2
orte/mca/ess/singleton/Makefile.am
Просмотреть файл

@ -33,7 +33,7 @@ component_noinst = libmca_ess_singleton.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_ess_singleton_la_SOURCES = $(sources)
mca_ess_singleton_la_LDFLAGS = -module -avoid-version

2
orte/mca/ess/slurm/Makefile.am
Просмотреть файл

@ -33,7 +33,7 @@ component_noinst = libmca_ess_slurm.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_ess_slurm_la_SOURCES = $(sources)
mca_ess_slurm_la_LDFLAGS = -module -avoid-version

2
orte/mca/ess/tm/Makefile.am
Просмотреть файл

@ -33,7 +33,7 @@ component_noinst = libmca_ess_tm.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_ess_tm_la_SOURCES = $(sources)
mca_ess_tm_la_LDFLAGS = -module -avoid-version

2
orte/mca/ess/tool/Makefile.am
Просмотреть файл

@ -34,7 +34,7 @@ component_noinst = libmca_ess_tool.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_ess_tool_la_SOURCES = $(sources)
mca_ess_tool_la_LDFLAGS = -module -avoid-version

2
orte/mca/filem/Makefile.am
Просмотреть файл

@ -39,7 +39,7 @@ $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
# Conditionally install the header files
if WANT_INSTALL_HEADERS
ortedir = $(ompiincludedir)/$(subdir)
ortedir = $(orteincludedir)/$(subdir)
nobase_orte_HEADERS = $(headers)
endif

2
orte/mca/filem/raw/Makefile.am
Просмотреть файл

@ -36,7 +36,7 @@ component_noinst = libmca_filem_raw.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_filem_raw_la_SOURCES = $(sources)
mca_filem_raw_la_LDFLAGS = -module -avoid-version

2
orte/mca/grpcomm/Makefile.am
Просмотреть файл

@ -29,7 +29,7 @@ libmca_grpcomm_la_SOURCES += $(headers)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
ortedir = $(ompiincludedir)/$(subdir)
ortedir = $(orteincludedir)/$(subdir)
nobase_orte_HEADERS = $(headers)
endif

2
orte/mca/grpcomm/bad/Makefile.am
Просмотреть файл

@ -34,7 +34,7 @@ component_noinst = libmca_grpcomm_bad.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_grpcomm_bad_la_SOURCES = $(sources)
mca_grpcomm_bad_la_LDFLAGS = -module -avoid-version

2
orte/mca/grpcomm/hier/Makefile.am
Просмотреть файл

@ -34,7 +34,7 @@ component_noinst = libmca_grpcomm_hier.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_grpcomm_hier_la_SOURCES = $(sources)
mca_grpcomm_hier_la_LDFLAGS = -module -avoid-version

2
orte/mca/grpcomm/pmi/Makefile.am
Просмотреть файл

@ -33,7 +33,7 @@ component_noinst = libmca_grpcomm_pmi.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_grpcomm_pmi_la_SOURCES = $(sources)
mca_grpcomm_pmi_la_LDFLAGS = -module -avoid-version $(grpcomm_pmi_LDFLAGS)

2
orte/mca/iof/Makefile.am
Просмотреть файл

@ -30,7 +30,7 @@ libmca_iof_la_SOURCES += $(headers)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
ortedir = $(ompiincludedir)/$(subdir)
ortedir = $(orteincludedir)/$(subdir)
nobase_orte_HEADERS = $(headers)
endif

2
orte/mca/iof/hnp/Makefile.am
Просмотреть файл

@ -37,7 +37,7 @@ hnp_SOURCES = \
iof_hnp_send.c \
iof_hnp_receive.c
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_iof_hnp_la_SOURCES = $(hnp_SOURCES)
mca_iof_hnp_la_LDFLAGS = -module -avoid-version

2
orte/mca/iof/mr_hnp/Makefile.am
Просмотреть файл

@ -27,7 +27,7 @@ mr_hnp_SOURCES = \
iof_mrhnp_read.c \
iof_mrhnp_receive.c
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_iof_mr_hnp_la_SOURCES = $(mr_hnp_SOURCES)
mca_iof_mr_hnp_la_LDFLAGS = -module -avoid-version

2
orte/mca/iof/mr_orted/Makefile.am
Просмотреть файл

@ -27,7 +27,7 @@ mr_orted_SOURCES = \
iof_mrorted_read.c \
iof_mrorted_receive.c
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_iof_mr_orted_la_SOURCES = $(mr_orted_SOURCES)
mca_iof_mr_orted_la_LDFLAGS = -module -avoid-version

2
orte/mca/iof/orted/Makefile.am
Просмотреть файл

@ -36,7 +36,7 @@ orted_SOURCES = \
iof_orted_read.c \
iof_orted_receive.c
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_iof_orted_la_SOURCES = $(orted_SOURCES)
mca_iof_orted_la_LDFLAGS = -module -avoid-version

2
orte/mca/iof/tool/Makefile.am
Просмотреть файл

@ -35,7 +35,7 @@ tool_SOURCES = \
iof_tool_component.c \
iof_tool_receive.c
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_iof_tool_la_SOURCES = $(tool_SOURCES)
mca_iof_tool_la_LDFLAGS = -module -avoid-version

2
orte/mca/odls/Makefile.am
Просмотреть файл

@ -30,7 +30,7 @@ libmca_odls_la_SOURCES += $(headers)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
ortedir = $(ompiincludedir)/$(subdir)
ortedir = $(orteincludedir)/$(subdir)
nobase_orte_HEADERS = $(headers)
endif

2
orte/mca/odls/default/Makefile.am
Просмотреть файл

@ -36,7 +36,7 @@ component_noinst = libmca_odls_default.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_odls_default_la_SOURCES = $(sources)
mca_odls_default_la_LDFLAGS = -module -avoid-version

2
orte/mca/oob/Makefile.am
Просмотреть файл

@ -30,7 +30,7 @@ libmca_oob_la_SOURCES += $(headers)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
ortedir = $(ompiincludedir)/$(subdir)
ortedir = $(orteincludedir)/$(subdir)
nobase_orte_HEADERS = $(headers)
endif

2
orte/mca/oob/tcp/Makefile.am
Просмотреть файл

@ -51,7 +51,7 @@ component_noinst = libmca_oob_tcp.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_oob_tcp_la_SOURCES = $(sources)
mca_oob_tcp_la_LDFLAGS = -module -avoid-version

2
orte/mca/oob/ud/Makefile.am
Просмотреть файл

@ -48,7 +48,7 @@ component_noinst = libmca_oob_ud.la
component_install =
endif
mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_oob_ud_la_SOURCES = $(sources)
mca_oob_ud_la_LDFLAGS = -module -avoid-version $(orte_oob_ud_LDFLAGS)

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше