diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix mpi

Browse Source
This commit is contained in:
Vitor Santos Costa 2015-01-27 03:16:07 +00:00
parent d023e2e493
commit d9357d3f49
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure vendored
View File

@ -16880,8 +16880,9 @@ fi
fi fi
MPILDF=`"$MPI_CC" --showme:link` MPILDF=`"$MPI_CC" --showme:link`
MPICF=`"$MPI_CC" --showme:compile` MPICF=`"$MPI_CC" --showme:compile`
LIBS="$LIBS $MPILDF" MPILIBDIRS=`"$MPI_CC" --showme:libdirs`
PKG_MPI="library/mpi" LIBS+=" $MPILDF"
PKG_MPI="library/lammpi library/mpi"
OLD_CC=${CC} OLD_CC=${CC}
CC=${MPI_CC} CC=${MPI_CC}
for ac_header in mpi.h for ac_header in mpi.h
@ -16896,6 +16897,11 @@ fi
done done
case "$target_os" in
*linux*)
for dir in "$MPILIBDIRS"; do LIBS+=" -Wl,-rpath=$dir"; done
;;
esac
CC=${OLD_CC} CC=${OLD_CC}
if test "$yap_cv_mpe" != "no" if test "$yap_cv_mpe" != "no"
then then
@ -16949,7 +16955,7 @@ fi
if test "$ac_cv_lib_mpe_MPE_Init_log" = yes if test "$ac_cv_lib_mpe_MPE_Init_log" = yes
then then
MPI_1LIBS="-lmpe" LIBS="-lmpe"
MPI_OBJS="$MPI_OBJS mpe.o" MPI_OBJS="$MPI_OBJS mpe.o"
fi fi
for ac_header in mpe.h for ac_header in mpe.h
@ -16977,6 +16983,7 @@ fi
mkdir -p library/lammpi mkdir -p library/lammpi

13
library/lammpi/configure.in
View File

@ -42,11 +42,17 @@ if test "$yap_cv_mpi" != "no" -a "$INSTALL_DLLS" != "no"; then
fi fi
MPILDF=`"$MPI_CC" --showme:link` MPILDF=`"$MPI_CC" --showme:link`
MPICF=`"$MPI_CC" --showme:compile` MPICF=`"$MPI_CC" --showme:compile`
LIBS="$LIBS $MPILDF" MPILIBDIRS=`"$MPI_CC" --showme:libdirs`
PKG_MPI="library/mpi" LIBS+=" $MPILDF"
PKG_MPI="library/lammpi library/mpi"
OLD_CC=${CC} OLD_CC=${CC}
CC=${MPI_CC} CC=${MPI_CC}
AC_CHECK_HEADERS(mpi.h) AC_CHECK_HEADERS(mpi.h)
case "$target_os" in
*linux*)
for dir in "$MPILIBDIRS"; do LIBS+=" -Wl,-rpath=$dir"; done
;;
esac
CC=${OLD_CC} CC=${OLD_CC}
if test "$yap_cv_mpe" != "no" if test "$yap_cv_mpe" != "no"
then then
@ -57,7 +63,7 @@ if test "$yap_cv_mpi" != "no" -a "$INSTALL_DLLS" != "no"; then
[AC_DEFINE(HAVE_LIBMPE, 0, [MPI Debugging off])]) [AC_DEFINE(HAVE_LIBMPE, 0, [MPI Debugging off])])
if test "$ac_cv_lib_mpe_MPE_Init_log" = yes if test "$ac_cv_lib_mpe_MPE_Init_log" = yes
then then
MPI_1LIBS="-lmpe" LIBS="-lmpe"
MPI_OBJS="$MPI_OBJS mpe.o" MPI_OBJS="$MPI_OBJS mpe.o"
fi fi
AC_CHECK_HEADERS(mpe.h) AC_CHECK_HEADERS(mpe.h)
@ -69,6 +75,7 @@ else
fi fi
AC_SUBST(PKG_MPI) AC_SUBST(PKG_MPI)
AC_SUBST(YAPMPILIB) AC_SUBST(YAPMPILIB)
AC_SUBST(MPILDF) AC_SUBST(MPILDF)