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 60a2d9fe221f4b98a611a360cf0a2ba822be6677 (commit) via 43c78f1f667ecad622dc76c29de3e8ae837d727d (commit) from 05e5bb0513638325eb4545eb82bd57313a771635 (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/60a2d9fe221f4b98a611a360cf0a2ba822... commit 60a2d9fe221f4b98a611a360cf0a2ba822be6677 Author: Michael Blocksome <[email protected]> Date: Mon Jul 15 15:12:22 2013 -0500 add support for alternative default pami library names. Signed-off-by: Haizhu Liu <[email protected]> diff --git a/src/mpid/pamid/subconfigure.m4 b/src/mpid/pamid/subconfigure.m4 index cab705e..25b0f67 100644 --- a/src/mpid/pamid/subconfigure.m4 +++ b/src/mpid/pamid/subconfigure.m4 @@ -27,6 +27,7 @@ AC_DEFUN([PAC_SUBCFG_PREREQ_]PAC_SUBCFG_AUTO_SUFFIX,[ AM_CONDITIONAL([BUILD_PAMID],[test "$device_name" = "pamid"]) AC_ARG_VAR([PAMILIBNAME],[can be used to override the name of the PAMI library (default: "pami")]) +original_PAMILIBNAME=${PAMILIBNAME} PAMILIBNAME=${PAMILIBNAME:-"pami"} AC_SUBST(PAMILIBNAME) export PAMILIBNAME @@ -158,6 +159,9 @@ if test "${pamid_platform}" = "BGQ" ; then PAC_APPEND_FLAG([-L${bgq_driver}/spi/lib], [WRAPPER_LDFLAGS]) if test -d ${bgq_driver}/comm/lib ; then PAC_APPEND_FLAG([-L${bgq_driver}/comm/lib], [WRAPPER_LDFLAGS]) + if test x${original_PAMILIBNAME} = x ; then + PAMILIBNAME=pami-gcc + fi else PAC_APPEND_FLAG([-L${bgq_driver}/comm/sys/lib], [WRAPPER_LDFLAGS]) fi http://git.mpich.org/mpich.git/commitdiff/43c78f1f667ecad622dc76c29de3e8ae83... commit 43c78f1f667ecad622dc76c29de3e8ae837d727d Author: Michael Blocksome <[email protected]> Date: Mon Jul 15 15:01:51 2013 -0500 update bgq pami library search process. Signed-off-by: Haizhu Liu <[email protected]> diff --git a/src/mpid/pamid/subconfigure.m4 b/src/mpid/pamid/subconfigure.m4 index 880040e..cab705e 100644 --- a/src/mpid/pamid/subconfigure.m4 +++ b/src/mpid/pamid/subconfigure.m4 @@ -156,10 +156,10 @@ if test "${pamid_platform}" = "BGQ" ; then PAC_APPEND_FLAG([-L${bgq_driver}/spi/lib], [LDFLAGS]) PAC_APPEND_FLAG([-L${bgq_driver}/spi/lib], [WRAPPER_LDFLAGS]) - if test -d ${bgq_driver}/comm/sys/lib ; then - PAC_APPEND_FLAG([-L${bgq_driver}/comm/sys/lib], [WRAPPER_LDFLAGS]) - else + if test -d ${bgq_driver}/comm/lib ; then PAC_APPEND_FLAG([-L${bgq_driver}/comm/lib], [WRAPPER_LDFLAGS]) + else + PAC_APPEND_FLAG([-L${bgq_driver}/comm/sys/lib], [WRAPPER_LDFLAGS]) fi break ----------------------------------------------------------------------- Summary of changes: src/mpid/pamid/subconfigure.m4 | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository