1 |
nerdboy 07/12/24 17:32:55 |
2 |
|
3 |
Modified: ChangeLog mpich2-1.0.6.ebuild |
4 |
Log: |
5 |
made libaio and basic romio support the standard config |
6 |
(Portage version: 2.1.4_rc7) |
7 |
|
8 |
Revision Changes Path |
9 |
1.24 sys-cluster/mpich2/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpich2/ChangeLog?rev=1.24&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpich2/ChangeLog?rev=1.24&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpich2/ChangeLog?r1=1.23&r2=1.24 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v |
18 |
retrieving revision 1.23 |
19 |
retrieving revision 1.24 |
20 |
diff -u -r1.23 -r1.24 |
21 |
--- ChangeLog 12 Dec 2007 05:20:45 -0000 1.23 |
22 |
+++ ChangeLog 24 Dec 2007 17:32:54 -0000 1.24 |
23 |
@@ -1,6 +1,19 @@ |
24 |
# ChangeLog for sys-cluster/mpich2 |
25 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.23 2007/12/12 05:20:45 nerdboy Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.24 2007/12/24 17:32:54 nerdboy Exp $ |
28 |
+ |
29 |
+ 24 Dec 2007; Steve Arnold <nerdboy@g.o> |
30 |
+ +files/mpich2-1.0.6-no-pvfs2.patch, mpich2-1.0.6.ebuild: |
31 |
+ Made libaio and basic romio support the standard config (removed romio USE |
32 |
+ flag). It still won't quite build the shared libs correctly if pvfs2 is |
33 |
+ installed but not enabled for the mpich2 build. The pvfs2 package must |
34 |
+ be removed if building mpich2 without pvfs2 support, otherwise the shared |
35 |
+ libraries will have a missing symbol from the detected PVFS2/AIO config. |
36 |
+ The libaio and basic romio support are required for the standard build |
37 |
+ (which is just unix filesystem and NFS client support) and pvfs2 support |
38 |
+ is completely optional. Everything now appears to build correctly as far |
39 |
+ as shared libs, both with and without pvfs2 support, the mpe and mpe-sdk |
40 |
+ stuff, etc. Test away... |
41 |
|
42 |
12 Dec 2007; Steve Arnold <nerdboy@g.o> mpich2-1.0.6.ebuild: |
43 |
fixed string quoting issue in bug 201182, although I can't reproduce |
44 |
|
45 |
|
46 |
|
47 |
1.4 sys-cluster/mpich2/mpich2-1.0.6.ebuild |
48 |
|
49 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpich2/mpich2-1.0.6.ebuild?rev=1.4&view=markup |
50 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpich2/mpich2-1.0.6.ebuild?rev=1.4&content-type=text/plain |
51 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpich2/mpich2-1.0.6.ebuild?r1=1.3&r2=1.4 |
52 |
|
53 |
Index: mpich2-1.0.6.ebuild |
54 |
=================================================================== |
55 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.0.6.ebuild,v |
56 |
retrieving revision 1.3 |
57 |
retrieving revision 1.4 |
58 |
diff -u -r1.3 -r1.4 |
59 |
--- mpich2-1.0.6.ebuild 12 Dec 2007 05:20:45 -0000 1.3 |
60 |
+++ mpich2-1.0.6.ebuild 24 Dec 2007 17:32:54 -0000 1.4 |
61 |
@@ -1,6 +1,6 @@ |
62 |
# Copyright 1999-2007 Gentoo Foundation |
63 |
# Distributed under the terms of the GNU General Public License v2 |
64 |
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.0.6.ebuild,v 1.3 2007/12/12 05:20:45 nerdboy Exp $ |
65 |
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.0.6.ebuild,v 1.4 2007/12/24 17:32:54 nerdboy Exp $ |
66 |
|
67 |
inherit autotools distutils eutils flag-o-matic fortran java-pkg-2 |
68 |
|
69 |
@@ -16,17 +16,17 @@ |
70 |
LICENSE="as-is" |
71 |
SLOT="0" |
72 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
73 |
-IUSE="crypt cxx debug doc fast fortran mpe mpe-sdk pvfs2 romio threads" |
74 |
+IUSE="crypt cxx debug doc fast fortran mpe mpe-sdk pvfs2 threads" |
75 |
|
76 |
DEPEND="virtual/libc |
77 |
sys-devel/libtool |
78 |
dev-lang/perl |
79 |
>=dev-lang/python-2.3 |
80 |
+ >=dev-libs/libaio-0.3.106 |
81 |
+ net-fs/nfs-utils |
82 |
+ pvfs2? ( >=sys-cluster/pvfs2-2.7.0 ) |
83 |
mpe-sdk? ( >=virtual/jdk-1.5 |
84 |
x11-proto/xproto ) |
85 |
- romio? ( >=dev-libs/libaio-0.3.106 |
86 |
- net-fs/nfs-utils ) |
87 |
- pvfs2? ( >=sys-cluster/pvfs2-2.7.0 ) |
88 |
doc? ( virtual/tetex )" |
89 |
|
90 |
RDEPEND="${DEPEND} |
91 |
@@ -99,8 +99,17 @@ |
92 |
epatch "${FILESDIR}/${P}-makefile.patch" || die "make patch failed" |
93 |
|
94 |
if use pvfs2; then |
95 |
- sed -i -e "s:-laio:-lpvfs2 -laio:g" Makefile.in \ |
96 |
+ sed -i -e "s:-laio:-laio -lpvfs2:g" Makefile.in \ |
97 |
|| die "sed pvfs2 failed" |
98 |
+ else |
99 |
+ epatch "${FILESDIR}/${P}-no-pvfs2.patch" || die "no pvfs patch failed" |
100 |
+ elog "" |
101 |
+ ewarn "If you wish to build without pvfs2 support, then you will" |
102 |
+ ewarn "need to remove the pvfs2 package if already installed." |
103 |
+ ewarn "Please remove pvfs2 and then rebuild mpich2. If pvfs2" |
104 |
+ ewarn "is not installed, then you can safely ignore this warning." |
105 |
+ elog "" |
106 |
+ epause 5 |
107 |
fi |
108 |
|
109 |
use mpe-sdk && setup-jvm-opts |
110 |
@@ -149,16 +158,20 @@ |
111 |
;; |
112 |
esac |
113 |
|
114 |
- if use romio; then |
115 |
- myconf="${myconf} --enable-aio" |
116 |
- if use pvfs2; then |
117 |
- myconf="${myconf} --with-file-system=pvfs2+nfs+ufs \ |
118 |
- --with-pvfs2=/usr" |
119 |
- else |
120 |
- myconf="${myconf} --with-file-system=nfs+ufs" |
121 |
- fi |
122 |
- use debug && myconf="${myconf} --enable-debug" |
123 |
+ # top-level configure option is romio |
124 |
+ myconf="${myconf} --enable-romio" |
125 |
+ |
126 |
+ # several of these are romio-specific configure options |
127 |
+ myconf="${myconf} --enable-aio --with-mpi=mpich2_mpi" |
128 |
+ if use pvfs2; then |
129 |
+ myconf="${myconf} --with-file-system=pvfs2+nfs+ufs \ |
130 |
+ --with-pvfs2=/usr" |
131 |
+ else |
132 |
+ # support for nfs and unix-like filesystems is the minimum |
133 |
+ myconf="${myconf} --with-file-system=nfs+ufs --with-pvfs2=no" |
134 |
fi |
135 |
+ # enable debug for romio |
136 |
+ use debug && myconf="${myconf} --enable-debug" |
137 |
|
138 |
use mpe && MPE_SRC_DIR="${S}"/src/mpe2 |
139 |
|
140 |
@@ -207,19 +220,19 @@ |
141 |
|
142 |
"${S}"/configure \ |
143 |
--with-pm=mpd,gforker \ |
144 |
+ --prefix=/usr \ |
145 |
+ --exec-prefix=/usr \ |
146 |
${myconf} \ |
147 |
${mpe_conf} \ |
148 |
${doc_conf} \ |
149 |
$(use_enable fast) \ |
150 |
$(use_enable cxx) \ |
151 |
$(use_enable mpe) \ |
152 |
- $(use_enable romio) \ |
153 |
$(use_enable threads) \ |
154 |
--libdir=/usr/$(get_libdir) \ |
155 |
--includedir=/usr/include \ |
156 |
--mandir=/usr/share/man \ |
157 |
--sysconfdir=/etc/"${PN}" \ |
158 |
- --prefix=/usr --exec-prefix=/usr \ |
159 |
--datadir=/usr/share/"${PN}" || die "configure failed" |
160 |
|
161 |
# no parallel make here |
162 |
@@ -319,7 +332,12 @@ |
163 |
elog "utilities. You probably don't want to enable the mpe-sdk USE" |
164 |
elog "flag on a server, cluster node, etc." |
165 |
elog "" |
166 |
- elog "Note 2: this package still needs testing with other Fortran90" |
167 |
+ elog "Note 2: the shared libraries are now building correctly, at" |
168 |
+ elog "least with and without pvfs2 support (the romio USE flag is no" |
169 |
+ elog "longer availaible, at least until the configure scripts can be" |
170 |
+ elog "made to stop finding things when they're disabled)." |
171 |
+ elog "" |
172 |
+ elog "Note 3: this package still needs testing with other Fortran90" |
173 |
elog "compilers besides gfortran (gcc4). The tests also need some" |
174 |
elog "magic to build properly within the portage build environment." |
175 |
elog "(currently the tests only build and run manually)" |
176 |
|
177 |
|
178 |
|
179 |
-- |
180 |
gentoo-commits@g.o mailing list |