[mpich-commits] [mpich] MPICH primary repository branch, 3.1.x, updated. v3.1.3-188-g89fd7dc
Service Account
noreply at mpich.org
Fri Feb 20 14:58:26 CST 2015
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, 3.1.x has been updated
via 89fd7dc3d717f0807e3438671dcd167c7f558ca6 (commit)
via 3774c8eb1ce2a5674a6ac8b746dea1dd096089fb (commit)
via 8ac6607db3a087cc8986d8124cab2b0930ae31ae (commit)
from b05fe62344b37c92a6e32fc36fbec1dc13ad1a17 (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/89fd7dc3d717f0807e3438671dcd167c7f558ca6
commit 89fd7dc3d717f0807e3438671dcd167c7f558ca6
Author: Junchao Zhang <jczhang at mcs.anl.gov>
Date: Thu Feb 19 09:41:15 2015 -0600
Update libtool and automake versions in release.pl
See also b21dc461 and 67577443
Signed-off-by: Wesley Bland <wbland at anl.gov>
diff --git a/maint/release.pl b/maint/release.pl
index 004301a..e8ff76f 100755
--- a/maint/release.pl
+++ b/maint/release.pl
@@ -153,8 +153,8 @@ print("\n");
## breakage. So make sure the ABI string in the release tarball is
## updated when you do that.
check_autotools_version("autoconf", "2.69");
-check_autotools_version("automake", "1.14");
-check_autotools_version("libtool", "2.4.2");
+check_autotools_version("automake", "1.15");
+check_autotools_version("libtool", "2.4.5");
print("\n");
http://git.mpich.org/mpich.git/commitdiff/3774c8eb1ce2a5674a6ac8b746dea1dd096089fb
commit 3774c8eb1ce2a5674a6ac8b746dea1dd096089fb
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date: Mon Feb 9 10:19:48 2015 -0600
require libtool >= 2.4.3
Two libtool patches we were carrying were released in version 2.4.3.
This commit drops our patches and bumps version required to run
autogen.sh.
Our patch for ifort on OSX is still present and updated to work with
the new version.
Signed-off-by: Wesley Bland <wbland at anl.gov>
diff --git a/autogen.sh b/autogen.sh
index 87c2246..5370dbf 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -544,7 +544,7 @@ fi
echo_n "Checking for libtool version... "
recreate_tmp
-ver=2.4
+ver=2.4.3
cat <<EOF >.tmp/configure.ac
AC_INIT(testver,1.0)
AC_CONFIG_AUX_DIR([m4])
@@ -924,33 +924,6 @@ if [ "$do_build_configure" = "yes" ] ; then
# Older versions are not supported to build mpich.
# Newer versions should have this patch already included.
if [ -f $amdir/confdb/libtool.m4 ] ; then
- echo_n "Patching libtool.m4 to enable support for powerpcle... "
- powerpcle_patch_requires_rebuild=no
- 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
- rm -f $amdir/confdb/libtool.m4.orig
- echo "done"
- else
- echo "failed"
- fi
-
- # There is no need to patch if we're not going to use Fortran.
- nagfor_patch_requires_rebuild=no
- if [ $do_bindings = "yes" ] ; then
- echo_n "Patching libtool.m4 for compatibility with nagfor shared libraries... "
- 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
- rm -f $amdir/confdb/libtool.m4.orig
- echo "done"
- else
- echo "failed"
- fi
- fi
-
# There is no need to patch if we're not going to use Fortran.
ifort_patch_requires_rebuild=no
if [ $do_bindings = "yes" ] ; then
@@ -966,7 +939,7 @@ if [ "$do_build_configure" = "yes" ] ; then
fi
fi
- if [ $powerpcle_patch_requires_rebuild = "yes" -o $nagfor_patch_requires_rebuild = "yes" -o $ifort_patch_requires_rebuild = "yes" ] ; then
+ if [ $ifort_patch_requires_rebuild = "yes" ] ; then
# Rebuild configure
(cd $amdir && $autoconf -f) || exit 1
# Reset libtool.m4 timestamps to avoid confusing make
diff --git a/maint/0001-libtool-powerpc-le-linux-support.patch b/maint/0001-libtool-powerpc-le-linux-support.patch
deleted file mode 100644
index 52e122a..0000000
--- a/maint/0001-libtool-powerpc-le-linux-support.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 723f678b8f297544b64880c8d80b60328e82cb45 Mon Sep 17 00:00:00 2001
-From: Alan Modra <amodra at bigpond.net.au>
-Date: Thu, 6 Jun 2013 14:48:22 +0930
-Subject: [PATCH] libtool: powerpc*le-linux support
-
-This is a combination of 5 commits.
-
-See libtool version 2.4.2.418
-http://git.savannah.gnu.org/cgit/libtool.git/log/?h=v2.4.2.418
-
-==========================================================================
-
- commit 12bf693d2d317c3313ee91058b2289d65a57f386
- Author: Alan Modra <amodra at bigpond.net.au>
- Date: Thu Jun 6 14:48:22 2013 +0930
-
- libtool: fix refixed unmangled powerpc*le-linux support patch
-
- * m4/libtool.m4: fix refixed badly unmangled hunks from earlier
- powerpc*le changeset.
- Reported by Peter Rosin.
-
- Signed-off-by: Gary V. Vaughan <gary at gnu.org>
-
- commit aa14ead14c5e375789f08026d9ece5963a9322c2
- Author: Alan Modra <amodra at bigpond.net.au>
- Date: Thu Jun 6 14:48:22 2013 +0930
-
- libtool: refix unmangled powerpc*le-linux support patch
-
- * m4/libtool.m4: refix badly unmangled hunks from earlier
- powerpc*le changeset.
- Reported by Peter Rosin.
-
- Signed-off-by: Gary V. Vaughan <gary at gnu.org>
-
- commit bb1c8bca8aee6e487aaf6b320b8f56f6ac0d21ac
- Author: Gary V. Vaughan <gary at gnu.org>
- Date: Thu Aug 22 15:38:00 2013 +0700
-
- libtool: refactor powerpc*le-linux case branch expressions.
-
- libtool (_LT_ENABLE_LOCK): make inner case branch expressions
- consistent with outer case expression.
- Reported by Peter Rosin.
-
- Signed-off-by: Gary V. Vaughan <gary at gnu.org>
-
- commit 03754a10041e86b2bd41b404a9ad824ef28bee7e
- Author: Alan Modra <amodra at bigpond.net.au>
- Date: Thu Jun 6 14:48:22 2013 +0930
-
- libtool: fix mangled powerpc*le-linux support patch
-
- * m4/libtool.m4: unmangled badly pasted hunks from previous
- changeset.
-
- commit f21c4d470423ab5b108918eaa5db295f644b12d1
- Author: Alan Modra <amodra at bigpond.net.au>
- Date: Thu Jun 6 14:48:22 2013 +0930
-
- libtool: initial powerpc*le-linux support
-
- * m4/libtool.m4 (ld -m flags): Remove non-canonical ppc host match.
- Support little-endian powerpc linux host.
-
-==========================================================================
----
- libltdl/m4/libtool.m4 | 12 +++++++++---
- 1 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
-index d812584..7aefebc 100644
---- a/libltdl/m4/libtool.m4
-+++ b/libltdl/m4/libtool.m4
-@@ -1268,7 +1268,7 @@ ia64-*-hpux*)
- rm -rf conftest*
- ;;
-
--x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
- s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
-@@ -1282,7 +1282,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
- x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
- ;;
-- ppc64-*linux*|powerpc64-*linux*)
-+ powerpc64le-*linux*)
-+ LD="${LD-ld} -m elf32lppclinux"
-+ ;;
-+ powerpc64-*linux*)
- LD="${LD-ld} -m elf32ppclinux"
- ;;
- s390x-*linux*)
-@@ -1301,7 +1304,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
- x86_64-*linux*)
- LD="${LD-ld} -m elf_x86_64"
- ;;
-- ppc*-*linux*|powerpc*-*linux*)
-+ powerpcle-*linux*)
-+ LD="${LD-ld} -m elf64lppc"
-+ ;;
-+ powerpc-*linux*)
- LD="${LD-ld} -m elf64ppc"
- ;;
- s390*-*linux*|s390*-*tpf*)
---
-1.7.1
-
diff --git a/maint/darwin-ifort.patch b/maint/darwin-ifort.patch
index 42c7816..7ce8b39 100644
--- a/maint/darwin-ifort.patch
+++ b/maint/darwin-ifort.patch
@@ -1,11 +1,11 @@
--- confdb/libtool.m4~ 2014-12-23 10:59:38.000000000 -0600
+++ confdb/libtool.m4 2014-12-23 11:05:54.000000000 -0600
-@@ -1097,7 +1097,10 @@
+@@ -1088,7 +1088,10 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+ _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
case $cc_basename in
-- ifort*) _lt_dar_can_shared=yes ;;
-+ ifort*)
+- ifort*|nagfor*) _lt_dar_can_shared=yes ;;
++ ifort*|nagfor*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _lt_dar_can_shared=yes
+ ;;
diff --git a/maint/libtool.m4.patch b/maint/libtool.m4.patch
deleted file mode 100644
index 4ad7628..0000000
--- a/maint/libtool.m4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
- tmp_sharedflag='--shared' ;;
-+ 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'
- tmp_addflag= ;;
http://git.mpich.org/mpich.git/commitdiff/8ac6607db3a087cc8986d8124cab2b0930ae31ae
commit 8ac6607db3a087cc8986d8124cab2b0930ae31ae
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date: Sun Feb 8 20:23:42 2015 -0600
require automake >= 1.15
Fixes a potential "arg list too long" error at make time. See
https://lists.gnu.org/archive/html/bug-automake/2014-10/msg00009.html
for more info. Closes #2215
Signed-off-by: Wesley Bland <wbland at anl.gov>
diff --git a/autogen.sh b/autogen.sh
index 8a8ccd9..87c2246 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -506,7 +506,7 @@ fi
echo_n "Checking for automake version... "
recreate_tmp
-ver=1.12.3
+ver=1.15
cat > .tmp/configure.ac<<EOF
AC_INIT(testver,1.0)
AC_CONFIG_AUX_DIR([m4])
-----------------------------------------------------------------------
Summary of changes:
autogen.sh | 33 +------
maint/0001-libtool-powerpc-le-linux-support.patch | 111 ---------------------
maint/darwin-ifort.patch | 8 +-
maint/libtool.m4.patch | 11 --
maint/release.pl | 4 +-
5 files changed, 9 insertions(+), 158 deletions(-)
delete mode 100644 maint/0001-libtool-powerpc-le-linux-support.patch
delete mode 100644 maint/libtool.m4.patch
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list