[gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/, sys-cluster/mpich2/files/

["Justin Bronder" <jsbronder@gentoo.org>]

commit:     19263a1bb7b8526d72fc9bc400bd40e13f0163ef
Author:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 02:58:48 2012 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 02:59:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=19263a1b

Drop failing tests for now, fix #393361

(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key 4D7043C9)

---
 sys-cluster/mpich2/ChangeLog                  |    4 ++
 sys-cluster/mpich2/files/mpich2-hvector.patch |   63 +++++++++++++++++++++++++
 sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild     |   11 ++++
 3 files changed, 78 insertions(+), 0 deletions(-)

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 388a63e..c117ec7 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Jan 2012; Justin Bronder <jsbronder@gentoo.org>
+  +files/mpich2-hvector.patch, mpich2-1.4.1_p1.ebuild:
+  Drop failing tests for now, fix #393361
+
 *mpich2-1.4.1_p1 (10 Jan 2012)
 
   10 Jan 2012; Justin Bronder <jsbronder@gentoo.org> -mpich2-1.4_rc2-r1.ebuild,

diff --git a/sys-cluster/mpich2/files/mpich2-hvector.patch b/sys-cluster/mpich2/files/mpich2-hvector.patch
new file mode 100644
index 0000000..9d67561
--- /dev/null
+++ b/sys-cluster/mpich2/files/mpich2-hvector.patch
@@ -0,0 +1,63 @@
+--- src/binding/f90/buildiface	2011-12-06 09:57:04.000000000 +0100
++++ src/binding/f90/buildiface	2011-12-06 09:57:54.000000000 +0100
+@@ -117,9 +117,13 @@
+ 		  'Type_hindexed-3' => 'int[]',
+ 		  'Type_indexed-2' => 'int[]',
+ 		  'Type_indexed-3' => 'int[]',
++		  'Type_hvector-3' => 'int', 
+ 		  'Type_struct-2' => 'int[]',
+ 		  'Type_struct-3' => 'int[]',
+ 		  'Type_struct-4' => 'MPI_Datatype[]',
++		  'Type_extent-2' => 'int',
++		  'Type_lb-2' => 'int',
++		  'Type_ub-2' => 'int',
+ 		  'Waitall-2' => 'MPI_Request[]',
+ 		  'Waitall-3' => 'MPI_Status[]',
+ 		  'Waitany-2' => 'MPI_Request[]',
+--- src/binding/f90/mpi_base.f90.in	2011-12-06 09:58:42.000000000 +0100
++++ src/binding/f90/mpi_base.f90.in	2011-12-06 10:00:30.000000000 +0100
+@@ -15,9 +15,7 @@
+        END SUBROUTINE MPI_COMM_FREE_KEYVAL
+ 
+        SUBROUTINE MPI_TYPE_EXTENT(v0,v1,ierror)
+-       USE MPI_CONSTANTS,ONLY:MPI_ADDRESS_KIND
+-       INTEGER v0
+-       INTEGER(KIND=MPI_ADDRESS_KIND) v1
++       INTEGER v0, v1
+        INTEGER ierror
+        END SUBROUTINE MPI_TYPE_EXTENT
+ 
+@@ -114,9 +112,7 @@
+        END SUBROUTINE MPI_OP_COMMUTATIVE
+ 
+        SUBROUTINE MPI_TYPE_LB(v0,v1,ierror)
+-       USE MPI_CONSTANTS,ONLY:MPI_ADDRESS_KIND
+-       INTEGER v0
+-       INTEGER(KIND=MPI_ADDRESS_KIND) v1
++       INTEGER v0, v1
+        INTEGER ierror
+        END SUBROUTINE MPI_TYPE_LB
+ 
+@@ -562,9 +558,7 @@
+        END SUBROUTINE MPI_TYPE_CREATE_RESIZED
+ 
+        SUBROUTINE MPI_TYPE_UB(v0,v1,ierror)
+-       USE MPI_CONSTANTS,ONLY:MPI_ADDRESS_KIND
+-       INTEGER v0
+-       INTEGER(KIND=MPI_ADDRESS_KIND) v1
++       INTEGER v0, v1
+        INTEGER ierror
+        END SUBROUTINE MPI_TYPE_UB
+ 
+@@ -822,10 +816,7 @@
+        END SUBROUTINE MPI_GET_VERSION
+ 
+        SUBROUTINE MPI_TYPE_HVECTOR(v0,v1,v2,v3,v4,ierror)
+-       USE MPI_CONSTANTS,ONLY:MPI_ADDRESS_KIND
+-       INTEGER v0, v1
+-       INTEGER(KIND=MPI_ADDRESS_KIND) v2
+-       INTEGER v3, v4
++       INTEGER v0, v1, v2, v3, v4
+        INTEGER ierror
+        END SUBROUTINE MPI_TYPE_HVECTOR
+ 

diff --git a/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild b/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
index d60b492..ab5e26a 100644
--- a/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
@@ -74,6 +74,10 @@ src_prepare() {
 
 	# 369263 and 1500 upstream. 	
 	epatch "${FILESDIR}"/fix-pkg-config-files.patch
+
+	# 393361, backport of r8809 upstream.
+	epatch "${FILESDIR}"/mpich2-hvector.patch
+
 	AT_M4DIR="${S}"/confdb eautoreconf || die
 }
 
@@ -138,6 +142,13 @@ src_test() {
 	sed -i '/^[# ]*bcastlength/d' test/mpi/errors/coll/testlist || die
 	sed -i '/^[# ]*non_zero_root/d' test/mpi/perf/testlist || die
 
+	# Failing tests based on requiring MPI_THREAD_MULTIPLE.
+	sed -i \
+		-e '/^[# ]*pt2pt/d' \
+		-e '/^[# ]*comm/d' \
+		-e '/^[# ]*spawn/d' \
+		test/mpi/threads/testlist || die
+
 	emake -j1 \
 		CC="${S}"/bin/mpicc \
 		CXX="${S}"/bin/mpicxx \