[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1.1-27-g716b893

[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  716b893a92b50bf432f637962d1bd1cc0c0fdbd6 (commit)
      from  3bee31e1420d409af983397642d3187f2c9497ef (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/716b893a92b50bf432f637962d1bd1cc0c0fdbd6

commit 716b893a92b50bf432f637962d1bd1cc0c0fdbd6
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date:   Tue Jun 24 19:13:28 2014 -0500

    Change patch's --forward flag for short equivalent
    
    Change --forward flag of patch for the short -N equivalent in autogen.sh
    to provide a broader compatibility, since it's the only recognized by
    BusyBox's patch version.
    
    Fixes #2120

diff --git a/autogen.sh b/autogen.sh
index cf16272..a286f5e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -925,7 +925,7 @@ if [ "$do_build_configure" = "yes" ] ; then
             if [ -f $amdir/confdb/libtool.m4 ] ; then
                 echo_n "Patching libtool.m4 to enable support for powerpcle... "
                 powerpcle_patch_requires_rebuild=no
-                patch --forward -s -l $amdir/confdb/libtool.m4 maint/0001-libtool-powerpc-le-linux-support.patch
+                patch -N -s -l $amdir/confdb/libtool.m4 maint/0001-libtool-powerpc-le-linux-support.patch
                 if [ $? -eq 0 ] ; then
                     powerpcle_patch_requires_rebuild=yes
                     # Remove possible leftovers, which don't imply a failure
@@ -939,7 +939,7 @@ if [ "$do_build_configure" = "yes" ] ; then
                 nagfor_patch_requires_rebuild=no
                 if [ $do_bindings = "yes" ] ; then
                     echo_n "Patching libtool.m4 for compatibility with nagfor shared libraries... "
-                    patch --forward -s -l $amdir/confdb/libtool.m4 maint/libtool.m4.patch
+                    patch -N -s -l $amdir/confdb/libtool.m4 maint/libtool.m4.patch
                     if [ $? -eq 0 ] ; then
                         nagfor_patch_requires_rebuild=yes
                         # Remove possible leftovers, which don't imply a failure

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

Summary of changes:
 autogen.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
MPICH primary repository