This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via be21b8dbd448866fbbc3639c5703a488766b608a (commit) via dca78b92b0551749ee370ff7eb298de777e949a2 (commit) from 716b893a92b50bf432f637962d1bd1cc0c0fdbd6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/be21b8dbd448866fbbc3639c5703a48876... commit be21b8dbd448866fbbc3639c5703a488766b608a Author: Antonio J. Pena <[email protected]> Date: Wed Jun 25 16:35:11 2014 -0500 Fix support for --program-prefix/-suffix options The support was broken by the following commits: 41ecf98e 998d9c67 Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/Makefile.am b/Makefile.am index 95d3f8a..654bd82 100644 --- a/Makefile.am +++ b/Makefile.am @@ -217,8 +217,8 @@ CLEAN_LOCAL_TARGETS += test-clean ## better approach might be to have each Makefile.mk append to a ## common set of rules. install-exec-hook: - for e in ${DESTDIR}${bindir}/mpicc ${DESTDIR}${bindir}/mpicxx \ - ${DESTDIR}${bindir}/mpif77 ${DESTDIR}${bindir}/mpifort ; do \ + for e in ${DESTDIR}${bindir}/@MPICC_NAME@ ${DESTDIR}${bindir}/@MPICXX_NAME@ \ + ${DESTDIR}${bindir}/@MPIF77_NAME@ ${DESTDIR}${bindir}/@MPIFORT_NAME@ ; do \ if test -e $${e} ; then \ sed -e 's|__PREFIX_TO_BE_FILLED_AT_INSTALL_TIME__|${prefix}|g' \ -e 's|__EXEC_PREFIX_TO_BE_FILLED_AT_INSTALL_TIME__|${exec_prefix}|g' \ diff --git a/configure.ac b/configure.ac index 614bd2e..4d0a929 100644 --- a/configure.ac +++ b/configure.ac @@ -5912,11 +5912,13 @@ MPI_NO_RMA=$MPID_NO_RMA export MPI_NO_RMA # Attach program prefix and suffix to executable names for Makefile +AC_SUBST(MPICC_NAME) AC_SUBST(MPICXX_NAME) AC_SUBST(MPICPP_NAME) AC_SUBST(MPIFORT_NAME) AC_SUBST(MPIF90_NAME) AC_SUBST(MPIF77_NAME) +PAC_GET_EXENAME("mpicc", MPICC_NAME) PAC_GET_EXENAME("mpicxx", MPICXX_NAME) PAC_GET_EXENAME("mpic++", MPICPP_NAME) PAC_GET_EXENAME("mpifort", MPIFORT_NAME) http://git.mpich.org/mpich.git/commitdiff/dca78b92b0551749ee370ff7eb298de777... commit dca78b92b0551749ee370ff7eb298de777e949a2 Author: Antonio J. Pena <[email protected]> Date: Wed Jun 25 16:23:59 2014 -0500 Revert "Remove MPICXX_NAME and MPICPP_NAME." This reverts commit 41ecf98e10a6e47c852a64b3b20f94d4b09ec53c. Conflicts: Makefile.am Resolution: Added support for new mpif90. Added: MPIFORT_NAME, MPIF90_NAME, and MPIF77_NAME Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/Makefile.am b/Makefile.am index e895618..95d3f8a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -229,12 +229,12 @@ install-exec-hook: rm -f $${e}.tmp ; \ fi ; \ done ; \ - if test -e ${DESTDIR}${bindir}/mpicxx ; then \ - cd ${DESTDIR}${bindir} && ln -f -s mpicxx mpic++ ; fi ; \ - if test -e ${DESTDIR}${bindir}/mpifort ; then \ - cd ${DESTDIR}${bindir} && ln -f -s mpifort mpif90 ; fi ; \ - if test -e ${DESTDIR}${bindir}/mpifort -a ! -e ${DESTDIR}${bindir}/mpif77 ; then \ - cd ${DESTDIR}${bindir} && ln -f -s mpifort mpif77 ; fi ; \ + if test -e ${DESTDIR}${bindir}/@MPICXX_NAME@ ; then \ + cd ${DESTDIR}${bindir} && ln -f -s @MPICXX_NAME@ @MPICPP_NAME@ ; fi ; \ + if test -e ${DESTDIR}${bindir}/@MPIFORT_NAME@ ; then \ + cd ${DESTDIR}${bindir} && ln -f -s @MPIFORT_NAME@ @MPIF90_NAME@ ; fi ; \ + if test -e ${DESTDIR}${bindir}/@MPIFORT_NAME@ -a ! -e ${DESTDIR}${bindir}/@MPIF77_NAME@ ; then \ + cd ${DESTDIR}${bindir} && ln -f -s @MPIFORT_NAME@ @MPIF77_NAME@ ; fi ; \ if test -e ${DESTDIR}${libdir}/lib@MPILIBNAME@@SHLIB_EXT@ ; then \ cd ${DESTDIR}${libdir} && ln -f -s lib@MPILIBNAME@@SHLIB_EXT@ libmpl@SHLIB_EXT@ ; \ cd ${DESTDIR}${libdir} && ln -f -s lib@MPILIBNAME@@SHLIB_EXT@ libopa@SHLIB_EXT@ ; \ diff --git a/configure.ac b/configure.ac index 0d0a982..614bd2e 100644 --- a/configure.ac +++ b/configure.ac @@ -5911,6 +5911,18 @@ export MPI_NO_SPAWN MPI_NO_RMA=$MPID_NO_RMA export MPI_NO_RMA +# Attach program prefix and suffix to executable names for Makefile +AC_SUBST(MPICXX_NAME) +AC_SUBST(MPICPP_NAME) +AC_SUBST(MPIFORT_NAME) +AC_SUBST(MPIF90_NAME) +AC_SUBST(MPIF77_NAME) +PAC_GET_EXENAME("mpicxx", MPICXX_NAME) +PAC_GET_EXENAME("mpic++", MPICPP_NAME) +PAC_GET_EXENAME("mpifort", MPIFORT_NAME) +PAC_GET_EXENAME("mpif90", MPIF90_NAME) +PAC_GET_EXENAME("mpif77", MPIF77_NAME) + AC_CONFIG_SUBDIRS([test/mpi]) dnl dnl Generate the Makefiles from Makefile.in ----------------------------------------------------------------------- Summary of changes: Makefile.am | 16 ++++++++-------- configure.ac | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 8 deletions(-) hooks/post-receive -- MPICH primary repository