[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.0.4-355-g80ad7cf

[mysql vizuser]

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  80ad7cf8446ae48e6177f2904fe7d3092054c514 (commit)
      from  1182a62aaa1b016f9fefcf78485b6b80b765eb47 (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/80ad7cf8446ae48e6177f2904fe7d3092054c514

commit 80ad7cf8446ae48e6177f2904fe7d3092054c514
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date:   Fri Jul 19 11:22:14 2013 -0500

    Small fix after 8cf54f1 fixing ticket #1870.
    
    Cleaned up spaces-tabs mismatch in patch file, and fixed a few parameters for
    the patch command.
    
    Signed-off-by: Pavan Balaji <balaji at mcs.anl.gov>

diff --git a/autogen.sh b/autogen.sh
index 29b0372..4282370 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -919,7 +919,7 @@ if [ $do_bindings = "yes" ] ; then
     echo "------------------------------------------------------------------------"
     echo
     echo_n "Patching libtool.m4 for compatibility with nagfor shared libraries... "
-    patch --forward -p0 < maint/libtool.m4.patch >/dev/null
+    patch --forward --no-backup-if-mismatch -p0 -s -l < maint/libtool.m4.patch
     if [ $? -eq 0 ] ; then
         echo "done"
     else
diff --git a/maint/libtool.m4.patch b/maint/libtool.m4.patch
index 8316416..4ad7628 100644
--- a/maint/libtool.m4.patch
+++ b/maint/libtool.m4.patch
@@ -1,10 +1,10 @@
 --- confdb/libtool.m4 2013-03-29 16:26:23.162062517 -0500
 +++ confdb/libtool.m4  2013-06-21 14:22:05.138914413 -0500
 @@ -4817,6 +4817,8 @@
-	lf95*)                          # Lahey Fortran 8.1
+	lf95*)				# Lahey Fortran 8.1
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
 	  tmp_sharedflag='--shared' ;;
-+	nagfor*)                        # NAGFOR 5.3
++	nagfor*)			# NAGFOR 5.3
 +	  tmp_sharedflag='-Wl,-shared' ;;
 	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
 	  tmp_sharedflag='-qmkshrobj'

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

Summary of changes:
 autogen.sh             |    2 +-
 maint/libtool.m4.patch |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
MPICH primary repository