[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b2-7-g2b97546

[Service Account]

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  2b975462f59dccaea7101ebebf25747c41f3c08a (commit)
       via  f2d0f7fe87a42e2b751e77a203b157249ed2d1f6 (commit)
      from  d04c8a1e86c811422bf6d5f5afd78f8584ae36b0 (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/2b975462f59dccaea7101ebebf25747c41f3c08a

commit 2b975462f59dccaea7101ebebf25747c41f3c08a
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Tue Mar 17 13:25:52 2015 -0700

    build-system: add lib64 dirs only if they exist
    
    Stop unconditionally adding lib64 directories to LDFLAGS. This simplifies
    linker commands and removes unnecessary flags from the compile wrappers.
    
    Signed-off-by: Pavan Balaji <balaji at anl.gov>

diff --git a/confdb/aclocal_libs.m4 b/confdb/aclocal_libs.m4
index 9dff742..09e9c4c 100644
--- a/confdb/aclocal_libs.m4
+++ b/confdb/aclocal_libs.m4
@@ -47,8 +47,11 @@ AC_DEFUN([PAC_SET_HEADER_LIB_PATH],[
           [AS_IF([test -n "${with_$1}"],
                  dnl is adding lib64 by default really the right thing to do?  What if
                  dnl we are on a 32-bit host that happens to have both lib dirs available?
-                 [PAC_APPEND_FLAG([-L${with_$1}/lib64],[LDFLAGS])
-                  PAC_APPEND_FLAG([-L${with_$1}/lib],[LDFLAGS])])])
+                 [PAC_APPEND_FLAG([-L${with_$1}/lib],[LDFLAGS])
+                  AS_IF([test -d "${with_$1}/lib64}"],
+		        [PAC_APPEND_FLAG([-L${with_$1}/lib64],[LDFLAGS])])
+                 ])
+          ])
 ])
 
 

http://git.mpich.org/mpich.git/commitdiff/f2d0f7fe87a42e2b751e77a203b157249ed2d1f6

commit f2d0f7fe87a42e2b751e77a203b157249ed2d1f6
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Mon Feb 23 16:17:44 2015 -0600

    build-system: fix prepend/append flag macros
    
    Contains 2 fixes:
    
      1. Use double quotes in grep expressions so variable expansion takes place.
      2. Tweak grep expressions so a substring match will not cause to new flag to
         be incorrectly de-duped.
    
    Signed-off-by: Pavan Balaji <balaji at anl.gov>

diff --git a/confdb/aclocal_util.m4 b/confdb/aclocal_util.m4
index 575a144..2648be5 100644
--- a/confdb/aclocal_util.m4
+++ b/confdb/aclocal_util.m4
@@ -64,7 +64,7 @@ dnl argument is already present in the variable
 AC_DEFUN([PAC_APPEND_FLAG],[
 	AC_REQUIRE([AC_PROG_FGREP])
 	AS_IF(
-		[echo "$$2" | $FGREP -e '$1' >/dev/null 2>&1],
+		[echo "$$2" | $FGREP -e "\<$1\>" >/dev/null 2>&1],
 		[echo "$2(='$$2') contains '$1', not appending" >&AS_MESSAGE_LOG_FD],
 		[echo "$2(='$$2') does not contain '$1', appending" >&AS_MESSAGE_LOG_FD
 		$2="$$2 $1"]
@@ -80,7 +80,7 @@ dnl should be added in reverse order.
 AC_DEFUN([PAC_PREPEND_FLAG],[
         AC_REQUIRE([AC_PROG_FGREP])
         AS_IF(
-                [echo "$$2" | $FGREP -e '$1' >/dev/null 2>&1],
+                [echo "$$2" | $FGREP -e "\<$1\>" >/dev/null 2>&1],
                 [echo "$2(='$$2') contains '$1', not prepending" >&AS_MESSAGE_LOG_FD],
                 [echo "$2(='$$2') does not contain '$1', prepending" >&AS_MESSAGE_LOG_FD
                 $2="$1 $$2"]

-----------------------------------------------------------------------

Summary of changes:
 confdb/aclocal_libs.m4 |    7 +++++--
 confdb/aclocal_util.m4 |    4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
MPICH primary repository