public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/, sys-cluster/mpich2/files/
@ 2011-06-12 22:32 Justin Bronder
  0 siblings, 0 replies; 3+ messages in thread
From: Justin Bronder @ 2011-06-12 22:32 UTC (permalink / raw
  To: gentoo-commits

commit:     0f22979b05165de377e96100ee2a137ec73cfd94
Author:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 12 22:31:11 2011 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 22:31:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0f22979b

Fix pkg-config files, #369263

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

---
 sys-cluster/mpich2/ChangeLog                       |    6 +
 .../mpich2/files/fix-pkg-config-files.patch        |  123 ++++++++++++++++++++
 ...ch2-1.4_rc2.ebuild => mpich2-1.4_rc2-r1.ebuild} |    6 +-
 3 files changed, 134 insertions(+), 1 deletions(-)

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 24b5f57..dd19de2 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mpich2-1.4_rc2-r1 (12 Jun 2011)
+
+  12 Jun 2011; Justin Bronder <jsbronder@gentoo.org> -mpich2-1.4_rc2.ebuild,
+  +mpich2-1.4_rc2-r1.ebuild, +files/fix-pkg-config-files.patch:
+  Fix pkg-config files, #369263
+
   10 May 2011; Justin Bronder <jsbronder@gentoo.org> mpich2-1.4_rc2.ebuild:
   Correct fix for #293665
 

diff --git a/sys-cluster/mpich2/files/fix-pkg-config-files.patch b/sys-cluster/mpich2/files/fix-pkg-config-files.patch
new file mode 100644
index 0000000..9e319f4
--- /dev/null
+++ b/sys-cluster/mpich2/files/fix-pkg-config-files.patch
@@ -0,0 +1,123 @@
+From e4ffe1eb191ab5d02de5c25e416f1d4d0f471f44 Mon Sep 17 00:00:00 2001
+From: Justin Bronder <jsbronder@gmail.com>
+Date: Sun, 12 Jun 2011 14:45:34 -0400
+Subject: [PATCH] fix pkg-config files
+
+https://trac.mcs.anl.gov/projects/mpich2/ticket/1044
+https://trac.mcs.anl.gov/projects/mpich2/ticket/1500
+---
+ configure.in                             |    6 ++++++
+ src/packaging/pkgconfig/mpich2-c.pc.in   |   10 ++--------
+ src/packaging/pkgconfig/mpich2-cxx.pc.in |   10 ++--------
+ src/packaging/pkgconfig/mpich2-f77.pc.in |   10 ++--------
+ src/packaging/pkgconfig/mpich2-f90.pc.in |   10 ++--------
+ 5 files changed, 14 insertions(+), 32 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index de22cac..8543bb1 100644
+--- a/configure.in
++++ b/configure.in
+@@ -5329,6 +5329,12 @@ AC_SUBST(MPICH_TIMER_KIND)
+ # Setup other replaceable values
+ AC_SUBST(MPILIBNAME)
+ AC_SUBST(PMPILIBNAME)
++PKGCONFIG_PMPILIB=""
++if test "$NEEDSPLIB" = yes -a test -n "${PMPILIBNAME}" ; then
++    PKGCONFIG_PMPILIB="-l${PMPILIBNAME}"
++fi
++AC_SUBST(PKGCONFIG_PMPILIB)
++
+ # Note that aint_size must be used instead of void_p where the desired check
+ # is on the size of MPI_Aint
+ aint_size=$ac_cv_sizeof_void_p
+diff --git a/src/packaging/pkgconfig/mpich2-c.pc.in b/src/packaging/pkgconfig/mpich2-c.pc.in
+index b071fc6..e0ab3fa 100644
+--- a/src/packaging/pkgconfig/mpich2-c.pc.in
++++ b/src/packaging/pkgconfig/mpich2-c.pc.in
+@@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+ 
+-if test "@NEEDSPLIB@" = "yes" ; then
+-   plib=@PMPILIBNAME@
+-else
+-   plib=
+-fi
+-
+ Name: mpich2
+ Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
+ Version: @MPICH2_VERSION@
+ Requires:
+-Libs: @WRAPPER_LDFLAGS@ -L$libdir -l$plib -l@MPILIBNAME@ @WRAPPER_LIBS@
+-Cflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CFLAGS@ -I$includedir
++Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@
++Cflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CFLAGS@ -I${includedir}
+diff --git a/src/packaging/pkgconfig/mpich2-cxx.pc.in b/src/packaging/pkgconfig/mpich2-cxx.pc.in
+index d21f9e6..d82e184 100644
+--- a/src/packaging/pkgconfig/mpich2-cxx.pc.in
++++ b/src/packaging/pkgconfig/mpich2-cxx.pc.in
+@@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+ 
+-if test "@NEEDSPLIB@" = "yes" ; then
+-   plib=@PMPILIBNAME@
+-else
+-   plib=
+-fi
+-
+ Name: mpich2
+ Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
+ Version: @MPICH2_VERSION@
+ Requires:
+-Libs: @WRAPPER_LDFLAGS@ -L$libdir -l$plib -l@MPILIBNAME@ @WRAPPER_LIBS@
+-Cxxflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CXXFLAGS@ -I$includedir
++Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@
++Cxxflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CXXFLAGS@ -I${includedir}
+diff --git a/src/packaging/pkgconfig/mpich2-f77.pc.in b/src/packaging/pkgconfig/mpich2-f77.pc.in
+index 1b48bf6..193c2ab 100644
+--- a/src/packaging/pkgconfig/mpich2-f77.pc.in
++++ b/src/packaging/pkgconfig/mpich2-f77.pc.in
+@@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+ 
+-if test "@NEEDSPLIB@" = "yes" ; then
+-   plib=@PMPILIBNAME@
+-else
+-   plib=
+-fi
+-
+ Name: mpich2
+ Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
+ Version: @MPICH2_VERSION@
+ Requires:
+-Libs: @WRAPPER_LDFLAGS@ -L$libdir -l$plib -l@MPILIBNAME@ @WRAPPER_LIBS@
+-Fflags: @WRAPPER_FFLAGS@ -I$includedir
++Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@
++Fflags: @WRAPPER_FFLAGS@ -I${includedir}
+diff --git a/src/packaging/pkgconfig/mpich2-f90.pc.in b/src/packaging/pkgconfig/mpich2-f90.pc.in
+index ebb8499..700976f 100644
+--- a/src/packaging/pkgconfig/mpich2-f90.pc.in
++++ b/src/packaging/pkgconfig/mpich2-f90.pc.in
+@@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+ 
+-if test "@NEEDSPLIB@" = "yes" ; then
+-   plib=@PMPILIBNAME@
+-else
+-   plib=
+-fi
+-
+ Name: mpich2
+ Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
+ Version: @MPICH2_VERSION@
+ Requires:
+-Libs: @WRAPPER_LDFLAGS@ -L$libdir -l$plib -l@MPILIBNAME@ @WRAPPER_LIBS@
+-Fcflags: @WRAPPER_FCFLAGS@ -I$includedir
++Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@
++Fcflags: @WRAPPER_FCFLAGS@ -I${includedir}
+-- 
+1.7.3.4
+

diff --git a/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild b/sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild
similarity index 95%
rename from sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
rename to sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild
index 383e59e..ddfe4b5 100644
--- a/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=2
-inherit eutils mpi toolchain-funcs
+inherit eutils mpi toolchain-funcs autotools
 
 MY_PV=${PV/_/}
 DESCRIPTION="MPICH2 - A portable MPI implementation"
@@ -56,6 +56,10 @@ src_prepare() {
 	sed -i \
 		-e 's,\(.*=\ *\)"@WRAPPER_[A-Z]*FLAGS@",\1"",' \
 		src/env/*.in || die
+
+	# 369263 and 1044, 1500 upstream. 	
+	epatch "${FILESDIR}"/fix-pkg-config-files.patch
+	AT_M4DIR="${S}"/confdb eautoreconf || die
 }
 
 src_configure() {



^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/, sys-cluster/mpich2/files/
@ 2012-01-10  2:59 Justin Bronder
  0 siblings, 0 replies; 3+ messages in thread
From: Justin Bronder @ 2012-01-10  2:59 UTC (permalink / raw
  To: gentoo-commits

commit:     6eeeee16f76085155f80d009cb2da56f4f44d245
Author:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 00:33:38 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=6eeeee16

Version bump

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

---
 sys-cluster/mpich2/ChangeLog                       |    8 +++-
 .../mpich2/files/fix-pkg-config-files.patch        |   50 +++++++++-----------
 ...h2-1.4_rc2-r1.ebuild => mpich2-1.4.1_p1.ebuild} |   18 ++++++-
 3 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index a50bc00..388a63e 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sys-cluster/mpich2
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mpich2-1.4.1_p1 (10 Jan 2012)
+
+  10 Jan 2012; Justin Bronder <jsbronder@gentoo.org> -mpich2-1.4_rc2-r1.ebuild,
+  +mpich2-1.4.1_p1.ebuild, files/fix-pkg-config-files.patch:
+  Version bump.
+
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> mpich2-1.2.1_p1-r2.ebuild,
   mpich2-1.4_rc2-r1.ebuild:
   Added fortran-2.eclass support

diff --git a/sys-cluster/mpich2/files/fix-pkg-config-files.patch b/sys-cluster/mpich2/files/fix-pkg-config-files.patch
index 9e319f4..d9c311e 100644
--- a/sys-cluster/mpich2/files/fix-pkg-config-files.patch
+++ b/sys-cluster/mpich2/files/fix-pkg-config-files.patch
@@ -1,23 +1,23 @@
-From e4ffe1eb191ab5d02de5c25e416f1d4d0f471f44 Mon Sep 17 00:00:00 2001
+From cba731049a24735beb660dc236f61070aa6e387a Mon Sep 17 00:00:00 2001
 From: Justin Bronder <jsbronder@gmail.com>
-Date: Sun, 12 Jun 2011 14:45:34 -0400
-Subject: [PATCH] fix pkg-config files
+Date: Thu, 5 Jan 2012 22:20:31 -0500
+Subject: [PATCH] fix pkg config files
 
+Conditionals are not supported.
 https://trac.mcs.anl.gov/projects/mpich2/ticket/1044
-https://trac.mcs.anl.gov/projects/mpich2/ticket/1500
 ---
  configure.in                             |    6 ++++++
- src/packaging/pkgconfig/mpich2-c.pc.in   |   10 ++--------
- src/packaging/pkgconfig/mpich2-cxx.pc.in |   10 ++--------
- src/packaging/pkgconfig/mpich2-f77.pc.in |   10 ++--------
- src/packaging/pkgconfig/mpich2-f90.pc.in |   10 ++--------
- 5 files changed, 14 insertions(+), 32 deletions(-)
+ src/packaging/pkgconfig/mpich2-c.pc.in   |    8 +-------
+ src/packaging/pkgconfig/mpich2-cxx.pc.in |    8 +-------
+ src/packaging/pkgconfig/mpich2-f77.pc.in |    8 +-------
+ src/packaging/pkgconfig/mpich2-f90.pc.in |    8 +-------
+ 5 files changed, 10 insertions(+), 28 deletions(-)
 
 diff --git a/configure.in b/configure.in
-index de22cac..8543bb1 100644
+index 294dc85..44b1010 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -5329,6 +5329,12 @@ AC_SUBST(MPICH_TIMER_KIND)
+@@ -5332,6 +5332,12 @@ AC_SUBST(MPICH_TIMER_KIND)
  # Setup other replaceable values
  AC_SUBST(MPILIBNAME)
  AC_SUBST(PMPILIBNAME)
@@ -31,7 +31,7 @@ index de22cac..8543bb1 100644
  # is on the size of MPI_Aint
  aint_size=$ac_cv_sizeof_void_p
 diff --git a/src/packaging/pkgconfig/mpich2-c.pc.in b/src/packaging/pkgconfig/mpich2-c.pc.in
-index b071fc6..e0ab3fa 100644
+index 394630b..e0ab3fa 100644
 --- a/src/packaging/pkgconfig/mpich2-c.pc.in
 +++ b/src/packaging/pkgconfig/mpich2-c.pc.in
 @@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@
@@ -48,12 +48,11 @@ index b071fc6..e0ab3fa 100644
  Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
  Version: @MPICH2_VERSION@
  Requires:
--Libs: @WRAPPER_LDFLAGS@ -L$libdir -l$plib -l@MPILIBNAME@ @WRAPPER_LIBS@
--Cflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CFLAGS@ -I$includedir
+-Libs: @WRAPPER_LDFLAGS@ -L${libdir} -l${plib} -l@MPILIBNAME@ @WRAPPER_LIBS@
 +Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@
-+Cflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CFLAGS@ -I${includedir}
+ Cflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CFLAGS@ -I${includedir}
 diff --git a/src/packaging/pkgconfig/mpich2-cxx.pc.in b/src/packaging/pkgconfig/mpich2-cxx.pc.in
-index d21f9e6..d82e184 100644
+index 936ade6..d82e184 100644
 --- a/src/packaging/pkgconfig/mpich2-cxx.pc.in
 +++ b/src/packaging/pkgconfig/mpich2-cxx.pc.in
 @@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@
@@ -70,12 +69,11 @@ index d21f9e6..d82e184 100644
  Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
  Version: @MPICH2_VERSION@
  Requires:
--Libs: @WRAPPER_LDFLAGS@ -L$libdir -l$plib -l@MPILIBNAME@ @WRAPPER_LIBS@
--Cxxflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CXXFLAGS@ -I$includedir
+-Libs: @WRAPPER_LDFLAGS@ -L${libdir} -l${plib} -l@MPILIBNAME@ @WRAPPER_LIBS@
 +Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@
-+Cxxflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CXXFLAGS@ -I${includedir}
+ Cxxflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CXXFLAGS@ -I${includedir}
 diff --git a/src/packaging/pkgconfig/mpich2-f77.pc.in b/src/packaging/pkgconfig/mpich2-f77.pc.in
-index 1b48bf6..193c2ab 100644
+index 291462e..193c2ab 100644
 --- a/src/packaging/pkgconfig/mpich2-f77.pc.in
 +++ b/src/packaging/pkgconfig/mpich2-f77.pc.in
 @@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@
@@ -92,12 +90,11 @@ index 1b48bf6..193c2ab 100644
  Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
  Version: @MPICH2_VERSION@
  Requires:
--Libs: @WRAPPER_LDFLAGS@ -L$libdir -l$plib -l@MPILIBNAME@ @WRAPPER_LIBS@
--Fflags: @WRAPPER_FFLAGS@ -I$includedir
+-Libs: @WRAPPER_LDFLAGS@ -L${libdir} -l${plib} -l@MPILIBNAME@ @WRAPPER_LIBS@
 +Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@
-+Fflags: @WRAPPER_FFLAGS@ -I${includedir}
+ Fflags: @WRAPPER_FFLAGS@ -I${includedir}
 diff --git a/src/packaging/pkgconfig/mpich2-f90.pc.in b/src/packaging/pkgconfig/mpich2-f90.pc.in
-index ebb8499..700976f 100644
+index ca15e18..700976f 100644
 --- a/src/packaging/pkgconfig/mpich2-f90.pc.in
 +++ b/src/packaging/pkgconfig/mpich2-f90.pc.in
 @@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@
@@ -114,10 +111,9 @@ index ebb8499..700976f 100644
  Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
  Version: @MPICH2_VERSION@
  Requires:
--Libs: @WRAPPER_LDFLAGS@ -L$libdir -l$plib -l@MPILIBNAME@ @WRAPPER_LIBS@
--Fcflags: @WRAPPER_FCFLAGS@ -I$includedir
+-Libs: @WRAPPER_LDFLAGS@ -L${libdir} -l${plib} -l@MPILIBNAME@ @WRAPPER_LIBS@
 +Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@
-+Fcflags: @WRAPPER_FCFLAGS@ -I${includedir}
+ Fcflags: @WRAPPER_FCFLAGS@ -I${includedir}
 -- 
 1.7.3.4
 

diff --git a/sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild b/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
similarity index 88%
rename from sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild
rename to sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
index 04ef15e..d60b492 100644
--- a/sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -58,7 +58,21 @@ src_prepare() {
 		-e 's,\(.*=\ *\)"@WRAPPER_[A-Z]*FLAGS@",\1"",' \
 		src/env/*.in || die
 
-	# 369263 and 1044, 1500 upstream. 	
+	# See
+	# http://lists.mcs.anl.gov/pipermail/mpich-discuss/2011-August/010680.html
+	# http://lists.mcs.anl.gov/pipermail/mpich-discuss/2011-August/010678.html
+	# and countless other sources pointing out the insanity.
+	sed -i \
+		-e 's|prefix=${DESTDIR}|prefix=|g' \
+		-e 's|dir=${DESTDIR}|dir=|g' \
+		Makefile.in || die
+
+	sed -i \
+		-e "s|prefix='\${DESTDIR}|prefix='|" \
+		-e "s|dir='\${DESTDIR}|dir='|" \
+		src/env/Makefile.in || die
+
+	# 369263 and 1500 upstream. 	
 	epatch "${FILESDIR}"/fix-pkg-config-files.patch
 	AT_M4DIR="${S}"/confdb eautoreconf || die
 }



^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/, sys-cluster/mpich2/files/
@ 2012-01-10  2:59 Justin Bronder
  0 siblings, 0 replies; 3+ messages in thread
From: Justin Bronder @ 2012-01-10  2:59 UTC (permalink / raw
  To: gentoo-commits

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 \



^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-01-10  3:00 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-10  2:59 [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/, sys-cluster/mpich2/files/ Justin Bronder
  -- strict thread matches above, loose matches on Subject: below --
2012-01-10  2:59 Justin Bronder
2011-06-12 22:32 Justin Bronder

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox