| 1 |
commit: 6eeeee16f76085155f80d009cb2da56f4f44d245 |
| 2 |
Author: Justin Bronder <jsbronder <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 10 00:33:38 2012 +0000 |
| 4 |
Commit: Justin Bronder <jsbronder <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 10 02:59:26 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6eeeee16 |
| 7 |
|
| 8 |
Version bump |
| 9 |
|
| 10 |
(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key 4D7043C9) |
| 11 |
|
| 12 |
--- |
| 13 |
sys-cluster/mpich2/ChangeLog | 8 +++- |
| 14 |
.../mpich2/files/fix-pkg-config-files.patch | 50 +++++++++----------- |
| 15 |
...h2-1.4_rc2-r1.ebuild => mpich2-1.4.1_p1.ebuild} | 18 ++++++- |
| 16 |
3 files changed, 46 insertions(+), 30 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog |
| 19 |
index a50bc00..388a63e 100644 |
| 20 |
--- a/sys-cluster/mpich2/ChangeLog |
| 21 |
+++ b/sys-cluster/mpich2/ChangeLog |
| 22 |
@@ -1,7 +1,13 @@ |
| 23 |
# ChangeLog for sys-cluster/mpich2 |
| 24 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
# $Header: $ |
| 27 |
|
| 28 |
+*mpich2-1.4.1_p1 (10 Jan 2012) |
| 29 |
+ |
| 30 |
+ 10 Jan 2012; Justin Bronder <jsbronder@g.o> -mpich2-1.4_rc2-r1.ebuild, |
| 31 |
+ +mpich2-1.4.1_p1.ebuild, files/fix-pkg-config-files.patch: |
| 32 |
+ Version bump. |
| 33 |
+ |
| 34 |
21 Jun 2011; Justin Lecher <jlec@g.o> mpich2-1.2.1_p1-r2.ebuild, |
| 35 |
mpich2-1.4_rc2-r1.ebuild: |
| 36 |
Added fortran-2.eclass support |
| 37 |
|
| 38 |
diff --git a/sys-cluster/mpich2/files/fix-pkg-config-files.patch b/sys-cluster/mpich2/files/fix-pkg-config-files.patch |
| 39 |
index 9e319f4..d9c311e 100644 |
| 40 |
--- a/sys-cluster/mpich2/files/fix-pkg-config-files.patch |
| 41 |
+++ b/sys-cluster/mpich2/files/fix-pkg-config-files.patch |
| 42 |
@@ -1,23 +1,23 @@ |
| 43 |
-From e4ffe1eb191ab5d02de5c25e416f1d4d0f471f44 Mon Sep 17 00:00:00 2001 |
| 44 |
+From cba731049a24735beb660dc236f61070aa6e387a Mon Sep 17 00:00:00 2001 |
| 45 |
From: Justin Bronder <jsbronder@×××××.com> |
| 46 |
-Date: Sun, 12 Jun 2011 14:45:34 -0400 |
| 47 |
-Subject: [PATCH] fix pkg-config files |
| 48 |
+Date: Thu, 5 Jan 2012 22:20:31 -0500 |
| 49 |
+Subject: [PATCH] fix pkg config files |
| 50 |
|
| 51 |
+Conditionals are not supported. |
| 52 |
https://trac.mcs.anl.gov/projects/mpich2/ticket/1044 |
| 53 |
-https://trac.mcs.anl.gov/projects/mpich2/ticket/1500 |
| 54 |
--- |
| 55 |
configure.in | 6 ++++++ |
| 56 |
- src/packaging/pkgconfig/mpich2-c.pc.in | 10 ++-------- |
| 57 |
- src/packaging/pkgconfig/mpich2-cxx.pc.in | 10 ++-------- |
| 58 |
- src/packaging/pkgconfig/mpich2-f77.pc.in | 10 ++-------- |
| 59 |
- src/packaging/pkgconfig/mpich2-f90.pc.in | 10 ++-------- |
| 60 |
- 5 files changed, 14 insertions(+), 32 deletions(-) |
| 61 |
+ src/packaging/pkgconfig/mpich2-c.pc.in | 8 +------- |
| 62 |
+ src/packaging/pkgconfig/mpich2-cxx.pc.in | 8 +------- |
| 63 |
+ src/packaging/pkgconfig/mpich2-f77.pc.in | 8 +------- |
| 64 |
+ src/packaging/pkgconfig/mpich2-f90.pc.in | 8 +------- |
| 65 |
+ 5 files changed, 10 insertions(+), 28 deletions(-) |
| 66 |
|
| 67 |
diff --git a/configure.in b/configure.in |
| 68 |
-index de22cac..8543bb1 100644 |
| 69 |
+index 294dc85..44b1010 100644 |
| 70 |
--- a/configure.in |
| 71 |
+++ b/configure.in |
| 72 |
-@@ -5329,6 +5329,12 @@ AC_SUBST(MPICH_TIMER_KIND) |
| 73 |
+@@ -5332,6 +5332,12 @@ AC_SUBST(MPICH_TIMER_KIND) |
| 74 |
# Setup other replaceable values |
| 75 |
AC_SUBST(MPILIBNAME) |
| 76 |
AC_SUBST(PMPILIBNAME) |
| 77 |
@@ -31,7 +31,7 @@ index de22cac..8543bb1 100644 |
| 78 |
# is on the size of MPI_Aint |
| 79 |
aint_size=$ac_cv_sizeof_void_p |
| 80 |
diff --git a/src/packaging/pkgconfig/mpich2-c.pc.in b/src/packaging/pkgconfig/mpich2-c.pc.in |
| 81 |
-index b071fc6..e0ab3fa 100644 |
| 82 |
+index 394630b..e0ab3fa 100644 |
| 83 |
--- a/src/packaging/pkgconfig/mpich2-c.pc.in |
| 84 |
+++ b/src/packaging/pkgconfig/mpich2-c.pc.in |
| 85 |
@@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@ |
| 86 |
@@ -48,12 +48,11 @@ index b071fc6..e0ab3fa 100644 |
| 87 |
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. |
| 88 |
Version: @MPICH2_VERSION@ |
| 89 |
Requires: |
| 90 |
--Libs: @WRAPPER_LDFLAGS@ -L$libdir -l$plib -l@MPILIBNAME@ @WRAPPER_LIBS@ |
| 91 |
--Cflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CFLAGS@ -I$includedir |
| 92 |
+-Libs: @WRAPPER_LDFLAGS@ -L${libdir} -l${plib} -l@MPILIBNAME@ @WRAPPER_LIBS@ |
| 93 |
+Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@ |
| 94 |
-+Cflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CFLAGS@ -I${includedir} |
| 95 |
+ Cflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CFLAGS@ -I${includedir} |
| 96 |
diff --git a/src/packaging/pkgconfig/mpich2-cxx.pc.in b/src/packaging/pkgconfig/mpich2-cxx.pc.in |
| 97 |
-index d21f9e6..d82e184 100644 |
| 98 |
+index 936ade6..d82e184 100644 |
| 99 |
--- a/src/packaging/pkgconfig/mpich2-cxx.pc.in |
| 100 |
+++ b/src/packaging/pkgconfig/mpich2-cxx.pc.in |
| 101 |
@@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@ |
| 102 |
@@ -70,12 +69,11 @@ index d21f9e6..d82e184 100644 |
| 103 |
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. |
| 104 |
Version: @MPICH2_VERSION@ |
| 105 |
Requires: |
| 106 |
--Libs: @WRAPPER_LDFLAGS@ -L$libdir -l$plib -l@MPILIBNAME@ @WRAPPER_LIBS@ |
| 107 |
--Cxxflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CXXFLAGS@ -I$includedir |
| 108 |
+-Libs: @WRAPPER_LDFLAGS@ -L${libdir} -l${plib} -l@MPILIBNAME@ @WRAPPER_LIBS@ |
| 109 |
+Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@ |
| 110 |
-+Cxxflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CXXFLAGS@ -I${includedir} |
| 111 |
+ Cxxflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CXXFLAGS@ -I${includedir} |
| 112 |
diff --git a/src/packaging/pkgconfig/mpich2-f77.pc.in b/src/packaging/pkgconfig/mpich2-f77.pc.in |
| 113 |
-index 1b48bf6..193c2ab 100644 |
| 114 |
+index 291462e..193c2ab 100644 |
| 115 |
--- a/src/packaging/pkgconfig/mpich2-f77.pc.in |
| 116 |
+++ b/src/packaging/pkgconfig/mpich2-f77.pc.in |
| 117 |
@@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@ |
| 118 |
@@ -92,12 +90,11 @@ index 1b48bf6..193c2ab 100644 |
| 119 |
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. |
| 120 |
Version: @MPICH2_VERSION@ |
| 121 |
Requires: |
| 122 |
--Libs: @WRAPPER_LDFLAGS@ -L$libdir -l$plib -l@MPILIBNAME@ @WRAPPER_LIBS@ |
| 123 |
--Fflags: @WRAPPER_FFLAGS@ -I$includedir |
| 124 |
+-Libs: @WRAPPER_LDFLAGS@ -L${libdir} -l${plib} -l@MPILIBNAME@ @WRAPPER_LIBS@ |
| 125 |
+Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@ |
| 126 |
-+Fflags: @WRAPPER_FFLAGS@ -I${includedir} |
| 127 |
+ Fflags: @WRAPPER_FFLAGS@ -I${includedir} |
| 128 |
diff --git a/src/packaging/pkgconfig/mpich2-f90.pc.in b/src/packaging/pkgconfig/mpich2-f90.pc.in |
| 129 |
-index ebb8499..700976f 100644 |
| 130 |
+index ca15e18..700976f 100644 |
| 131 |
--- a/src/packaging/pkgconfig/mpich2-f90.pc.in |
| 132 |
+++ b/src/packaging/pkgconfig/mpich2-f90.pc.in |
| 133 |
@@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@ |
| 134 |
@@ -114,10 +111,9 @@ index ebb8499..700976f 100644 |
| 135 |
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. |
| 136 |
Version: @MPICH2_VERSION@ |
| 137 |
Requires: |
| 138 |
--Libs: @WRAPPER_LDFLAGS@ -L$libdir -l$plib -l@MPILIBNAME@ @WRAPPER_LIBS@ |
| 139 |
--Fcflags: @WRAPPER_FCFLAGS@ -I$includedir |
| 140 |
+-Libs: @WRAPPER_LDFLAGS@ -L${libdir} -l${plib} -l@MPILIBNAME@ @WRAPPER_LIBS@ |
| 141 |
+Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@ |
| 142 |
-+Fcflags: @WRAPPER_FCFLAGS@ -I${includedir} |
| 143 |
+ Fcflags: @WRAPPER_FCFLAGS@ -I${includedir} |
| 144 |
-- |
| 145 |
1.7.3.4 |
| 146 |
|
| 147 |
|
| 148 |
diff --git a/sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild b/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild |
| 149 |
similarity index 88% |
| 150 |
rename from sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild |
| 151 |
rename to sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild |
| 152 |
index 04ef15e..d60b492 100644 |
| 153 |
--- a/sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild |
| 154 |
+++ b/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild |
| 155 |
@@ -1,4 +1,4 @@ |
| 156 |
-# Copyright 1999-2011 Gentoo Foundation |
| 157 |
+# Copyright 1999-2012 Gentoo Foundation |
| 158 |
# Distributed under the terms of the GNU General Public License v2 |
| 159 |
# $Header: $ |
| 160 |
|
| 161 |
@@ -58,7 +58,21 @@ src_prepare() { |
| 162 |
-e 's,\(.*=\ *\)"@WRAPPER_[A-Z]*FLAGS@",\1"",' \ |
| 163 |
src/env/*.in || die |
| 164 |
|
| 165 |
- # 369263 and 1044, 1500 upstream. |
| 166 |
+ # See |
| 167 |
+ # http://lists.mcs.anl.gov/pipermail/mpich-discuss/2011-August/010680.html |
| 168 |
+ # http://lists.mcs.anl.gov/pipermail/mpich-discuss/2011-August/010678.html |
| 169 |
+ # and countless other sources pointing out the insanity. |
| 170 |
+ sed -i \ |
| 171 |
+ -e 's|prefix=${DESTDIR}|prefix=|g' \ |
| 172 |
+ -e 's|dir=${DESTDIR}|dir=|g' \ |
| 173 |
+ Makefile.in || die |
| 174 |
+ |
| 175 |
+ sed -i \ |
| 176 |
+ -e "s|prefix='\${DESTDIR}|prefix='|" \ |
| 177 |
+ -e "s|dir='\${DESTDIR}|dir='|" \ |
| 178 |
+ src/env/Makefile.in || die |
| 179 |
+ |
| 180 |
+ # 369263 and 1500 upstream. |
| 181 |
epatch "${FILESDIR}"/fix-pkg-config-files.patch |
| 182 |
AT_M4DIR="${S}"/confdb eautoreconf || die |
| 183 |
} |
Archives