1 |
jsbronder 10/07/03 01:35:41 |
2 |
|
3 |
Modified: ChangeLog mpich2-1.2.1_p1.ebuild |
4 |
Log: |
5 |
Update python handling (#316937). Cleanup deps. Automatically turn on threads if mpi-threads are requested. |
6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.53 sys-cluster/mpich2/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/mpich2/ChangeLog?rev=1.53&view=markup |
12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/mpich2/ChangeLog?rev=1.53&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/mpich2/ChangeLog?r1=1.52&r2=1.53 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v |
18 |
retrieving revision 1.52 |
19 |
retrieving revision 1.53 |
20 |
diff -u -r1.52 -r1.53 |
21 |
--- ChangeLog 14 Jun 2010 21:44:05 -0000 1.52 |
22 |
+++ ChangeLog 3 Jul 2010 01:35:41 -0000 1.53 |
23 |
@@ -1,6 +1,10 @@ |
24 |
# ChangeLog for sys-cluster/mpich2 |
25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.52 2010/06/14 21:44:05 arfrever Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.53 2010/07/03 01:35:41 jsbronder Exp $ |
28 |
+ |
29 |
+ 03 Jul 2010; Justin Bronder <jsbronder@g.o> mpich2-1.2.1_p1.ebuild: |
30 |
+ Update python handling (#316937). Cleanup deps. Automatically turn on |
31 |
+ threads if mpi-threads are requested. |
32 |
|
33 |
14 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
34 |
mpich2-1.0.8.ebuild: |
35 |
|
36 |
|
37 |
|
38 |
1.3 sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild?rev=1.3&view=markup |
41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild?rev=1.3&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild?r1=1.2&r2=1.3 |
43 |
|
44 |
Index: mpich2-1.2.1_p1.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild,v |
47 |
retrieving revision 1.2 |
48 |
retrieving revision 1.3 |
49 |
diff -u -r1.2 -r1.3 |
50 |
--- mpich2-1.2.1_p1.ebuild 14 Mar 2010 18:09:44 -0000 1.2 |
51 |
+++ mpich2-1.2.1_p1.ebuild 3 Jul 2010 01:35:41 -0000 1.3 |
52 |
@@ -1,9 +1,13 @@ |
53 |
# Copyright 1999-2010 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild,v 1.2 2010/03/14 18:09:44 jsbronder Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild,v 1.3 2010/07/03 01:35:41 jsbronder Exp $ |
57 |
|
58 |
EAPI=2 |
59 |
-inherit eutils fortran |
60 |
+PYTHON_DEPEND="*:2.4" |
61 |
+RESTRICT_PYTHON_ABIS="3.*" |
62 |
+ |
63 |
+inherit eutils fortran python |
64 |
+ |
65 |
MY_PV=${PV/_/} |
66 |
DESCRIPTION="MPICH2 - A portable MPI implementation" |
67 |
HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php" |
68 |
@@ -14,32 +18,24 @@ |
69 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
70 |
IUSE="+cxx debug doc fortran pvfs2 threads romio mpi-threads" |
71 |
|
72 |
-COMMON_DEPEND="dev-lang/perl |
73 |
- >=dev-lang/python-2.3 |
74 |
+COMMON_DEPEND="dev-libs/libaio |
75 |
romio? ( net-fs/nfs-utils ) |
76 |
- pvfs2? ( >=sys-cluster/pvfs2-2.7.0 ) |
77 |
- dev-libs/libaio |
78 |
- !media-sound/mpd |
79 |
- !sys-cluster/mpiexec |
80 |
- !sys-cluster/openmpi |
81 |
- !sys-cluster/lam-mpi |
82 |
- !sys-cluster/mpich" |
83 |
+ pvfs2? ( >=sys-cluster/pvfs2-2.7.0 )" |
84 |
|
85 |
DEPEND="${COMMON_DEPEND} |
86 |
+ dev-lang/perl |
87 |
sys-devel/libtool" |
88 |
|
89 |
RDEPEND="${COMMON_DEPEND} |
90 |
- net-misc/openssh" |
91 |
+ !media-sound/mpd |
92 |
+ !sys-cluster/openmpi |
93 |
+ !sys-cluster/lam-mpi" |
94 |
|
95 |
S="${WORKDIR}"/${PN}-${MY_PV} |
96 |
|
97 |
pkg_setup() { |
98 |
- if [ -n "${MPICH_CONFIGURE_OPTS}" ]; then |
99 |
- elog "User-specified configure options are ${MPICH_CONFIGURE_OPTS}." |
100 |
- else |
101 |
- elog "User-specified configure options are not set." |
102 |
- elog "If needed, see the docs and set MPICH_CONFIGURE_OPTS." |
103 |
- fi |
104 |
+ python_set_active_version 2 |
105 |
+ python_pkg_setup |
106 |
|
107 |
if use fortran ; then |
108 |
FORTRAN="g77 gfortran ifort ifc" |
109 |
@@ -47,9 +43,8 @@ |
110 |
fi |
111 |
|
112 |
if use mpi-threads && ! use threads; then |
113 |
- die "USE=mpi-threads requires USE=threads" |
114 |
+ ewarn "mpi-threads requires threads, assuming that's what you want" |
115 |
fi |
116 |
- |
117 |
MPD_CONF_FILE_DIR=/etc/${PN} |
118 |
} |
119 |
|
120 |
@@ -83,7 +78,7 @@ |
121 |
} |
122 |
|
123 |
src_configure() { |
124 |
- local c="${MPICH_CONFIGURE_OPTS} --enable-sharedlibs=gcc" |
125 |
+ local c="--enable-sharedlibs=gcc" |
126 |
local romio_conf |
127 |
|
128 |
# The configure statements can be somewhat confusing, as they |
129 |
@@ -92,10 +87,17 @@ |
130 |
|
131 |
use debug && c="${c} --enable-g=all --enable-debuginfo" |
132 |
|
133 |
- if use threads ; then |
134 |
+ if use mpi-threads; then |
135 |
+ # MPI-THREAD requries threading. |
136 |
c="${c} --with-thread-package=pthreads" |
137 |
+ c="${c} --enable-threads=default" |
138 |
else |
139 |
- c="${c} --with-thread-package=none" |
140 |
+ if use threads ; then |
141 |
+ c="${c} --with-thread-package=pthreads" |
142 |
+ else |
143 |
+ c="${c} --with-thread-package=none" |
144 |
+ fi |
145 |
+ c="${c} --enable-threads=single" |
146 |
fi |
147 |
|
148 |
# enable f90 support for appropriate compilers |
149 |
@@ -106,14 +108,8 @@ |
150 |
c="${c} --enable-f77 --disable-f90";; |
151 |
esac |
152 |
|
153 |
- if use mpi-threads; then |
154 |
- c="${c} --enable-threads=default" |
155 |
- else |
156 |
- c="${c} --enable-threads=single" |
157 |
- fi |
158 |
- |
159 |
if use pvfs2; then |
160 |
- # nfs and ufs are defaults in 1.0.8 at least. |
161 |
+ # nfs and ufs are default. |
162 |
romio_conf="--with-file-system=pvfs2+nfs+ufs --with-pvfs2=/usr" |
163 |
fi |
164 |
|
165 |
@@ -186,4 +182,10 @@ |
166 |
elog "MPE2 has been removed from this ebuild and now stands alone" |
167 |
elog "as sys-cluster/mpe2." |
168 |
elog "" |
169 |
+ |
170 |
+ python_mod_optimize /usr/bin/ |
171 |
+} |
172 |
+ |
173 |
+pkg_postrm() { |
174 |
+ python_mod_cleanup /usr/bin/ |
175 |
} |