* [gentoo-commits] gentoo-x86 commit in sys-cluster/mpich2/files: mpich2-1.4.1-fix-pkg-config-files.patch mpich2-hvector.patch
@ 2012-03-07 1:28 Justin Bronder (jsbronder)
0 siblings, 0 replies; only message in thread
From: Justin Bronder (jsbronder) @ 2012-03-07 1:28 UTC (permalink / raw
To: gentoo-commits
jsbronder 12/03/07 01:28:34
Added: mpich2-1.4.1-fix-pkg-config-files.patch
mpich2-hvector.patch
Log:
Version bump, fix #393361, EAPI 4, fortran update.
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Revision Changes Path
1.1 sys-cluster/mpich2/files/mpich2-1.4.1-fix-pkg-config-files.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/mpich2/files/mpich2-1.4.1-fix-pkg-config-files.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/mpich2/files/mpich2-1.4.1-fix-pkg-config-files.patch?rev=1.1&content-type=text/plain
Index: mpich2-1.4.1-fix-pkg-config-files.patch
===================================================================
From cba731049a24735beb660dc236f61070aa6e387a Mon Sep 17 00:00:00 2001
From: Justin Bronder <jsbronder@gmail.com>
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
---
configure.in | 6 ++++++
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 294dc85..44b1010 100644
--- a/configure.in
+++ b/configure.in
@@ -5332,6 +5332,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 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@
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@
+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 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@
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@
+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 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@
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@
+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 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@
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@
+Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@
Fcflags: @WRAPPER_FCFLAGS@ -I${includedir}
--
1.7.3.4
1.1 sys-cluster/mpich2/files/mpich2-hvector.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/mpich2/files/mpich2-hvector.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/mpich2/files/mpich2-hvector.patch?rev=1.1&content-type=text/plain
Index: mpich2-hvector.patch
===================================================================
--- 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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-03-07 1:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-07 1:28 [gentoo-commits] gentoo-x86 commit in sys-cluster/mpich2/files: mpich2-1.4.1-fix-pkg-config-files.patch mpich2-hvector.patch Justin Bronder (jsbronder)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox