1 |
commit: 234d5dff9855caf48add7bb90ac2d45755ce0c83 |
2 |
Author: Donnie Berkholz <dberkholz <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 30 19:17:18 2011 +0000 |
4 |
Commit: Donnie Berkholz <dberkholz <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 30 19:17:18 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dberkholz.git;a=commit;h=234d5dff |
7 |
|
8 |
sys-cluster/charm: bump to 6.2.1 |
9 |
|
10 |
--- |
11 |
sys-cluster/charm/ChangeLog | 124 +++++++++++++++++++ |
12 |
sys-cluster/charm/Manifest | 9 ++ |
13 |
sys-cluster/charm/charm-6.2.1.ebuild | 128 ++++++++++++++++++++ |
14 |
.../charm/files/charm-6.1.2-charmc-gentoo.patch | 25 ++++ |
15 |
.../charm/files/charm-doc-makefile-gentoo.patch | 35 ++++++ |
16 |
.../charm/files/charm-examples-gentoo.patch | 105 ++++++++++++++++ |
17 |
sys-cluster/charm/files/charm-fpic-gentoo.patch | 32 +++++ |
18 |
.../files/charm-python-configure-gentoo.patch | 29 +++++ |
19 |
sys-cluster/charm/metadata.xml | 9 ++ |
20 |
9 files changed, 496 insertions(+), 0 deletions(-) |
21 |
|
22 |
diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog |
23 |
new file mode 100644 |
24 |
index 0000000..6dbcd5f |
25 |
--- /dev/null |
26 |
+++ b/sys-cluster/charm/ChangeLog |
27 |
@@ -0,0 +1,124 @@ |
28 |
+# ChangeLog for sys-cluster/charm |
29 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
30 |
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.30 2011/07/20 17:04:58 pacho Exp $ |
31 |
+ |
32 |
+ 20 Jul 2011; Pacho Ramos <pacho@g.o> metadata.xml: |
33 |
+ Drop maintainer due retirement, bug #105599 |
34 |
+ |
35 |
+*charm-6.2.0 (24 Apr 2010) |
36 |
+ |
37 |
+ 24 Apr 2010; Donnie Berkholz <dberkholz@g.o>; +charm-6.2.0.ebuild: |
38 |
+ Bump. |
39 |
+ |
40 |
+ 23 Apr 2010; Donnie Berkholz <dberkholz@g.o>; |
41 |
+ charm-6.1.2-r2.ebuild: |
42 |
+ Fix a typo in src/scripts/Makefile -- bigsim_ooc.h, not bigism_ooc.h. |
43 |
+ |
44 |
+ 10 Feb 2010; Samuli Suominen <ssuominen@g.o> charm-6.1.2-r2.ebuild: |
45 |
+ Fix poppler depend. |
46 |
+ |
47 |
+ 27 Nov 2009; Jeff Gardner <je_fro@g.o> charm-6.1.2-r2.ebuild, |
48 |
+ files/charm-6.1.2-charmc-gentoo.patch: |
49 |
+ Fix patch again |
50 |
+ |
51 |
+ 27 Nov 2009; Jeff Gardner <je_fro@g.o> -charm-6.1.2.ebuild, |
52 |
+ -charm-6.1.2-r1.ebuild, files/charm-6.1.2-charmc-gentoo.patch: |
53 |
+ Cleanup and fix charm-6.1.2-charmc-gentoo.patch |
54 |
+ |
55 |
+*charm-6.1.2-r2 (27 Nov 2009) |
56 |
+ |
57 |
+ 27 Nov 2009; Jeff Gardner <je_fro@g.o> +charm-6.1.2-r2.ebuild: |
58 |
+ Fix up some no-no's in the ebuild thanks to flameeyes in bug #294463. |
59 |
+ |
60 |
+ 31 Aug 2009; Peter Alfredsen <loki_val@g.o> charm-6.1.2.ebuild, |
61 |
+ charm-6.1.2-r1.ebuild: |
62 |
+ Again update dependencies w.r.t. bug 264230, fully-split-out poppler |
63 |
+ transition. |
64 |
+ |
65 |
+*charm-6.1.2-r1 (07 Jun 2009) |
66 |
+ |
67 |
+ 07 Jun 2009; Jeff Gardner <je_fro@g.o> +charm-6.1.2-r1.ebuild, |
68 |
+ files/charm-6.1.2-charmc-gentoo.patch: |
69 |
+ Fix CHARMLIB in charmc |
70 |
+ |
71 |
+ 07 Jun 2009; Jeff Gardner <je_fro@g.o> charm-6.1.2.ebuild: |
72 |
+ Fix ${S} |
73 |
+ |
74 |
+*charm-6.1.2 (01 Jun 2009) |
75 |
+ |
76 |
+ 01 Jun 2009; Jeff Gardner <je_fro@g.o> +charm-6.1.2.ebuild, |
77 |
+ +files/charm-6.1.2-charmc-gentoo.patch, +files/charm-6.1.2-charmrun.patch, |
78 |
+ metadata.xml: |
79 |
+ Latest version. |
80 |
+ |
81 |
+ 30 May 2009; Ulrich Mueller <ulm@g.o> charm-5.9.ebuild: |
82 |
+ Remove app-text/tetex from dependencies, bug 227443. |
83 |
+ |
84 |
+ 30 Mar 2009; Peter Alfredsen <loki_val@g.o> charm-5.9.ebuild: |
85 |
+ Update dependencies w.r.t. bug 264230, fully-split-out poppler transition. |
86 |
+ |
87 |
+ 17 Oct 2008; Markus Meier <maekke@g.o> metadata.xml: |
88 |
+ smp USE-flag is global now |
89 |
+ |
90 |
+ 28 Jul 2008; Panagiotis Christopoulos <pchrist@g.o> metadata.xml: |
91 |
+ Update metadata.xml to include USE flag descriptions. Entries taken from |
92 |
+ profiles/use.local.desc |
93 |
+ |
94 |
+ 18 May 2008; Markus Dittrich <markusle@g.o> charm-5.9.ebuild: |
95 |
+ Added missing dependency on texlive-genericrecommended. |
96 |
+ |
97 |
+ 18 May 2008; Markus Dittrich <markusle@g.o> charm-5.9.ebuild: |
98 |
+ Switched virtual/tetex -> virtual/latex-base (see bug #222501). |
99 |
+ |
100 |
+ 06 Apr 2008; Markus Dittrich <markusle@g.o> charm-5.9.ebuild: |
101 |
+ Removed ifc use flag (see bug #97929). |
102 |
+ |
103 |
+ 22 Sep 2007; Markus Dittrich <markusle@g.o> |
104 |
+ +files/charm-5.9-gcc-4.2.patch, charm-5.9.ebuild: |
105 |
+ Added patch to fix compile problem with gcc-4.2. |
106 |
+ |
107 |
+ 22 Feb 2007; Piotr Jaroszyński <peper@g.o> Manifest: |
108 |
+ Transition to Manifest2. |
109 |
+ |
110 |
+ 23 May 2006; Robin H. Johnson <robbat2@g.o> charm-5.9.ebuild: |
111 |
+ Change to poppler for building docs, pdftohtml is deprecated in Gentoo. |
112 |
+ |
113 |
+ 21 Apr 2006; Markus Dittrich <markusle@g.o> |
114 |
+ +files/charm-5.9-gcc4.patch, charm-5.9.ebuild: |
115 |
+ Added patch to fix compile problems with gcc-4.1. Thanks much to |
116 |
+ Brady Catherman <bradyc@××××××.edu> for his help with debugging. |
117 |
+ This fixes bug #130374. |
118 |
+ |
119 |
+ 07 Apr 2006; Markus Dittrich <markusle@g.o> |
120 |
+ +files/charm-examples-gentoo.patch, charm-5.9.ebuild: |
121 |
+ Re-added an optimized version of the charm-examples-gentoo.patch |
122 |
+ since it keeps disappearing from the mirrors. |
123 |
+ |
124 |
+ 28 Feb 2006; Markus Dittrich <markusle@g.o> |
125 |
+ -files/charm-examples-gentoo.patch, charm-5.9.ebuild: |
126 |
+ Moved large patch file to mirrors. See bug #123634. |
127 |
+ |
128 |
+ 12 Jan 2006; Robin H. Johnson <robbat2@g.o> charm-5.9.ebuild: |
129 |
+ app-text/poppler also provides pdftohtml. |
130 |
+ |
131 |
+ 22 Dec 2005; Markus Dittrich <markusle@g.o> metadata.xml: |
132 |
+ removed from package.mask and marked as ~x86. Changed maintainer to |
133 |
+ <markusle@g.o>. |
134 |
+ |
135 |
+ 10 Nov 2005; Markus Dittrich <markusle@g.o> |
136 |
+ +files/charm-charmc-gentoo.patch, +files/charm-doc-makefile-gentoo.patch, |
137 |
+ +files/charm-examples-gentoo.patch, +files/charm-fpic-gentoo.patch, |
138 |
+ +files/charm-python-configure-gentoo.patch, +metadata.xml, |
139 |
+ +charm-5.9.ebuild: |
140 |
+ moved from sci-libs/charm to sys-cluster/charm |
141 |
+ |
142 |
+*charm-5.9 (05 Oct 2005) |
143 |
+ |
144 |
+ 05 Oct 2005; Olivier Fisette <ribosome@g.o> |
145 |
+ +files/charm-charmc-gentoo.patch, +files/charm-doc-makefile-gentoo.patch, |
146 |
+ +files/charm-examples-gentoo.patch, +files/charm-fpic-gentoo.patch, |
147 |
+ +files/charm-python-configure-gentoo.patch, +metadata.xml, |
148 |
+ +charm-5.9.ebuild: |
149 |
+ Initial import. Ebuild contributed by Markus Dittrich <markusle@×××××.com> |
150 |
+ (bug #108031). |
151 |
+ |
152 |
|
153 |
diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest |
154 |
new file mode 100644 |
155 |
index 0000000..a030758 |
156 |
--- /dev/null |
157 |
+++ b/sys-cluster/charm/Manifest |
158 |
@@ -0,0 +1,9 @@ |
159 |
+AUX charm-6.1.2-charmc-gentoo.patch 983 RMD160 531733244e1ef563435f97ee0b476f4bb896f750 SHA1 952220bb0d7699616e99d1913ae7ab14693d6357 SHA256 a512effc73e6e7d8c9e5ae3877d41496960207803b71dcb58c4c06ddb5ce6520 |
160 |
+AUX charm-doc-makefile-gentoo.patch 1348 RMD160 15941f44aad97d3f67938725d64cb94583522c73 SHA1 2c965c4d6d9390fc48f29ebae9336bab720d77bc SHA256 9a0a7426daaa05adf5f5ec35c20a6fa1f0842e58e1beefebf8f94ff1debabe03 |
161 |
+AUX charm-examples-gentoo.patch 3920 RMD160 d038f9e2f32db47a6f335c92dd73e727a54dd2b1 SHA1 574e3d55561b5c549e4190804eeec0f5a7a08f71 SHA256 8eafde8fc87500194bc1eda05c04fd138298e6a39785c50f4f66781a52f6c01e |
162 |
+AUX charm-fpic-gentoo.patch 963 RMD160 d725ce4085638996244db909d4b30ce0e5623bce SHA1 02e80605505bf1aa3ec371643b165f3890ba0cc1 SHA256 e02cc065399771a3f6e2946446fc47809df1eae6fa40a9bc00b1947805a2f5ec |
163 |
+AUX charm-python-configure-gentoo.patch 984 RMD160 fb7f9279e528d3e74756c734c6837379f50148e2 SHA1 3a7e9e81b9f4019aad643e5fe68093f185b8229f SHA256 df476e74c78d2a2c03c9619a8d90e81c60c125e7cbf514f3ff27375d8469130d |
164 |
+DIST charm-6.2.1_src.tar.gz 44531283 RMD160 3a04dc78fcf9a551fcf0d69c967e43171b30ebb5 SHA1 b9a8e225c74a329f53689663693b1305fc90b99d SHA256 2538d9354e7f965322674a45d293aee0633db3ed0e2d0c66f09305c48ff7d46c |
165 |
+EBUILD charm-6.2.1.ebuild 3134 RMD160 fafbd55cf2e566e683e6735177791087dc251429 SHA1 7c18610890d968894de7fb9d9369befff76d2e24 SHA256 912e20f57dcfdad06b886bb19372ac64f310d2b26bcdf7848663d48cdec74c0a |
166 |
+MISC ChangeLog 4793 RMD160 f741e49eae6384273b8ef38adbbd0bccdf6f0586 SHA1 a4ad663d0a0ae55f654e7cf8d5731acd933d3cdb SHA256 b551f4ea9b8cf37e095fcfca28b68bf1e1e1ef7bd3428bbb85d44dfb7c05d3b6 |
167 |
+MISC metadata.xml 301 RMD160 33178161cd82fc0f8c9c0c017af2e8e6479b7468 SHA1 d2436d58e768a8021223feab7729bc60a00d05e8 SHA256 8a9f74607266454c78f94120ed3f5d81ab8d01c72b54b8532521cf8742db1cb8 |
168 |
|
169 |
diff --git a/sys-cluster/charm/charm-6.2.1.ebuild b/sys-cluster/charm/charm-6.2.1.ebuild |
170 |
new file mode 100644 |
171 |
index 0000000..d98b59c |
172 |
--- /dev/null |
173 |
+++ b/sys-cluster/charm/charm-6.2.1.ebuild |
174 |
@@ -0,0 +1,128 @@ |
175 |
+# Copyright 1999-2010 Gentoo Foundation |
176 |
+# Distributed under the terms of the GNU General Public License v2 |
177 |
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.2.0.ebuild,v 1.1 2010/04/24 00:00:15 dberkholz Exp $ |
178 |
+ |
179 |
+EAPI=2 |
180 |
+inherit eutils toolchain-funcs flag-o-matic multilib |
181 |
+ |
182 |
+MY_P=${PN}-${PV%.*} |
183 |
+DESCRIPTION="Charm++ is a message-passing parallel language and runtime system." |
184 |
+LICENSE="charm" |
185 |
+HOMEPAGE="http://charm.cs.uiuc.edu/" |
186 |
+SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}_src.tar.gz" |
187 |
+ |
188 |
+LICENSE="charm" |
189 |
+SLOT="0" |
190 |
+KEYWORDS="~amd64 ~x86" |
191 |
+IUSE="cmkopt tcp smp doc" |
192 |
+ |
193 |
+DEPEND="doc? ( >=app-text/poppler-0.12.3-r3[utils] |
194 |
+ dev-tex/latex2html |
195 |
+ virtual/tex-base )" |
196 |
+RDEPEND="" |
197 |
+ |
198 |
+S=${WORKDIR}/${MY_P} |
199 |
+ |
200 |
+case ${ARCH} in |
201 |
+ x86) |
202 |
+ CHARM_ARCH="net-linux" ;; |
203 |
+ |
204 |
+ amd64) |
205 |
+ CHARM_ARCH="net-linux-amd64" ;; |
206 |
+esac |
207 |
+ |
208 |
+src_prepare() { |
209 |
+ # TCP instead of default UDP for socket comunication |
210 |
+ # protocol |
211 |
+ if use tcp; then |
212 |
+ CHARM_OPTS="${CHARM_OPTS} tcp" |
213 |
+ fi |
214 |
+ |
215 |
+ # enable direct SMP support using shared memory |
216 |
+ if use smp; then |
217 |
+ CHARM_OPTS="${CHARM_OPTS} smp" |
218 |
+ fi |
219 |
+ |
220 |
+ # CMK optimization |
221 |
+ if use cmkopt; then |
222 |
+ append-flags -DCMK_OPTIMIZE=1 |
223 |
+ fi |
224 |
+ |
225 |
+ echo "charm opts: ${CHARM_OPTS}" |
226 |
+} |
227 |
+ |
228 |
+src_compile() { |
229 |
+ # build charmm++ first |
230 |
+ cd "${S}" |
231 |
+ ./build charm++ ${CHARM_ARCH} ${CHARM_OPTS} ${CFLAGS} || \ |
232 |
+ die "Failed to build charm++" |
233 |
+ |
234 |
+ # make pdf/html docs |
235 |
+ if use doc; then |
236 |
+ cd "${S}"/doc |
237 |
+ make doc || die "failed to create pdf/html docs" |
238 |
+ fi |
239 |
+} |
240 |
+ |
241 |
+src_install() { |
242 |
+ # make charmc play well with gentoo before |
243 |
+ # we move it into /usr/bin |
244 |
+ epatch "${FILESDIR}/charm-6.1.2-charmc-gentoo.patch" |
245 |
+ |
246 |
+ sed -e "s|gentoo-include|${P}|" \ |
247 |
+ -e "s|gentoo-libdir|$(get_libdir)|g" \ |
248 |
+ -e "s|VERSION|${P}/VERSION|" \ |
249 |
+ -i ./src/scripts/charmc || die "failed patching charmc script" |
250 |
+ |
251 |
+ # install binaries |
252 |
+ cd "${S}"/bin |
253 |
+ dobin ./charmd ./charmd_faceless ./charmr* ./charmc ./charmxi \ |
254 |
+ ./conv-cpm ./dep.pl || die "Failed to install binaries" |
255 |
+ |
256 |
+ # install headers |
257 |
+ cd "${S}"/include |
258 |
+ insinto /usr/include/${P} |
259 |
+ doins * || die "failed to install header files" |
260 |
+ |
261 |
+ # install static libs |
262 |
+ # charm has a lot of .o "libs" that it requires at runtime |
263 |
+ cd "${S}"/lib |
264 |
+ dolib.a *.{a,o} || die "failed to install static libs" |
265 |
+ |
266 |
+ # install shared libs |
267 |
+ cd "${S}"/lib_so |
268 |
+ dolib.so *.so* || die "failed to install shared libs" |
269 |
+ |
270 |
+ # basic docs |
271 |
+ cd "${S}" |
272 |
+ dodoc CHANGES README || die "Failed to install docs" |
273 |
+ |
274 |
+ # install examples |
275 |
+ find examples/ -name 'Makefile' | xargs sed \ |
276 |
+ -r "s:(../)+bin/charmc:/usr/bin/charmc:" -i || \ |
277 |
+ die "Failed to fix examples" |
278 |
+ find examples/ -name 'Makefile' | xargs sed \ |
279 |
+ -r "s:./charmrun:./charmrun ++local:" -i || \ |
280 |
+ die "Failed to fix examples" |
281 |
+ insinto /usr/share/doc/${PF}/examples |
282 |
+ doins -r examples/charm++/* |
283 |
+ |
284 |
+ # pdf/html docs |
285 |
+ if use doc; then |
286 |
+ cd "${S}"/doc |
287 |
+ # install pdfs |
288 |
+ insinto /usr/share/doc/${PF}/pdf |
289 |
+ doins doc/pdf/* || die "failed to install pdf docs" |
290 |
+ # install html |
291 |
+ docinto html |
292 |
+ dohtml -r doc/html/* || die "failed to install html docs" |
293 |
+ fi |
294 |
+} |
295 |
+ |
296 |
+pkg_postinst() { |
297 |
+ echo |
298 |
+ einfo "Please test your charm installation by copying the" |
299 |
+ einfo "content of /usr/share/doc/${PF}/examples to a" |
300 |
+ einfo "temporary location and run 'make test'." |
301 |
+ echo |
302 |
+} |
303 |
|
304 |
diff --git a/sys-cluster/charm/files/charm-6.1.2-charmc-gentoo.patch b/sys-cluster/charm/files/charm-6.1.2-charmc-gentoo.patch |
305 |
new file mode 100644 |
306 |
index 0000000..e381a7e |
307 |
--- /dev/null |
308 |
+++ b/sys-cluster/charm/files/charm-6.1.2-charmc-gentoo.patch |
309 |
@@ -0,0 +1,25 @@ |
310 |
+--- src/scripts/charmc 2009-11-27 02:24:30.648381166 -0600 |
311 |
++++ src/scripts/charmc.new 2009-11-27 02:31:06.150618002 -0600 |
312 |
+@@ -343,19 +343,9 @@ |
313 |
+ PROG_EXT=".exe" |
314 |
+ fi |
315 |
+ |
316 |
+-CHARMLIB="$CHARMBIN/../lib" |
317 |
+-CHARMINC="$CHARMBIN/../include" |
318 |
+-CHARMLIBSO= |
319 |
+-if test -d "$CHARMBIN/../lib_so" |
320 |
+-then |
321 |
+- CHARMLIBSO=`cd $CHARMBIN/../lib_so 2>/dev/null && pwd` |
322 |
+- #getting absolute path is harder than thought because of symbolic links and .. |
323 |
+- #ksh needs cd -P to resolve werid symbolic links, however -P is not portable |
324 |
+- #csh is ok too if it exists |
325 |
+- test -z "$CHARMLIBSO" && CHARMLIBSO=`cd -P $CHARMBIN/../lib_so 2>/dev/null && pwd` |
326 |
+- test -z "$CHARMLIBSO" && CHARMLIBSO=`csh -c "cd $CHARMBIN/../lib_so >& /dev/null && pwd"` |
327 |
+- test -z "$CHARMLIBSO" && echo "$CHARMBIN/../lib_so: not found" && exit 1 |
328 |
+-fi |
329 |
++CHARMLIB="/usr/gentoo-libdir" |
330 |
++CHARMINC="/usr/include/gentoo-include" |
331 |
++CHARMLIBSO="/usr/gentoo-libdir" |
332 |
+ |
333 |
+ ############################################################################## |
334 |
+ # |
335 |
|
336 |
diff --git a/sys-cluster/charm/files/charm-doc-makefile-gentoo.patch b/sys-cluster/charm/files/charm-doc-makefile-gentoo.patch |
337 |
new file mode 100644 |
338 |
index 0000000..f18497a |
339 |
--- /dev/null |
340 |
+++ b/sys-cluster/charm/files/charm-doc-makefile-gentoo.patch |
341 |
@@ -0,0 +1,35 @@ |
342 |
+# patch to properly build the docs as pdf and html |
343 |
+ |
344 |
+--- charm-5.9/doc/Makefile 2004-10-14 06:12:10.000000000 +0000 |
345 |
++++ charm-5.9-patched/doc/Makefile 2005-09-24 22:55:53.000000000 +0000 |
346 |
+@@ -1,4 +1,4 @@ |
347 |
+-IDIR=../../doc |
348 |
++IDIR=./doc |
349 |
+ LNCMD=test ! -f pplmanual.sty && ln -f -s ../pplmanual.sty . |
350 |
+ RMCMD=rm -f ./pplmanual.sty |
351 |
+ DIRS=install converse convext charm++ libraries f90charm pose \ |
352 |
+--- charm-5.9/doc/Makefile.common 2005-04-19 17:21:52.000000000 +0000 |
353 |
++++ charm-5.9-patched/doc/Makefile.common 2005-09-24 22:56:30.000000000 +0000 |
354 |
+@@ -10,7 +10,7 @@ |
355 |
+ # (optional) PROJECT_LINK: HTML to include at bottom of page |
356 |
+ |
357 |
+ # Destination directory for local copy of files (e.g., on user machine) |
358 |
+-DOCDIR=.. |
359 |
++DOCDIR=../doc |
360 |
+ |
361 |
+ # Destination directory for web-accessible copy of files (e.g., on PPL machines) |
362 |
+ WEBDIR=/www/ppl_manuals |
363 |
+@@ -71,12 +71,10 @@ |
364 |
+ -rm -fr index.tex $(FIG_CLEAN) |
365 |
+ |
366 |
+ # Build local copy of documentation: |
367 |
+-doc: all |
368 |
++doc: pdf html |
369 |
+ if [ ! -d $(DOCDIR) ] ; then mkdir $(DOCDIR) ; fi |
370 |
+- if [ ! -d $(DOCDIR)/ps ] ; then mkdir $(DOCDIR)/ps ; fi |
371 |
+ if [ ! -d $(DOCDIR)/pdf ] ; then mkdir $(DOCDIR)/pdf ; fi |
372 |
+ if [ ! -d $(DOCDIR)/html ] ; then mkdir $(DOCDIR)/html ; fi |
373 |
+- /bin/cp $(FILE).ps $(DOCDIR)/ps/$(DEST).ps |
374 |
+ /bin/cp $(FILE).pdf $(DOCDIR)/pdf/$(DEST).pdf |
375 |
+ /bin/rm -rf $(DOCDIR)/html/$(DEST) |
376 |
+ /bin/cp -R $(FILE) $(DOCDIR)/html/$(DEST) |
377 |
|
378 |
diff --git a/sys-cluster/charm/files/charm-examples-gentoo.patch b/sys-cluster/charm/files/charm-examples-gentoo.patch |
379 |
new file mode 100644 |
380 |
index 0000000..ef8089f |
381 |
--- /dev/null |
382 |
+++ b/sys-cluster/charm/files/charm-examples-gentoo.patch |
383 |
@@ -0,0 +1,105 @@ |
384 |
+diff -Naur charm-5.9/examples/pose/ASIM/Makefile charm-5.9-backup/examples/pose/ASIM/Makefile |
385 |
+--- charm-5.9/examples/pose/ASIM/Makefile 2004-10-22 04:38:26.000000000 +0000 |
386 |
++++ charm-5.9-backup/examples/pose/ASIM/Makefile 2005-09-27 03:27:08.000000000 +0000 |
387 |
+@@ -12,8 +12,8 @@ |
388 |
+ OPTS=-O#-DCMK_OPTIMIZE=1 -DCMK_MEMCHECKS_OFF=1 |
389 |
+ |
390 |
+ CHARMBASE=../../.. |
391 |
+-CHARMBIN=$(CHARMBASE)/bin |
392 |
+-CHARMINC=$(CHARMBASE)/include |
393 |
++CHARMBIN=/usr/bin |
394 |
++CHARMINC=/usr/include/charm-5.9 |
395 |
+ |
396 |
+ CHARMC=$(CHARMBIN)/charmc -I$(CHARMINC)/pose $(OPTS) |
397 |
+ |
398 |
+diff -Naur charm-5.9/examples/pose/BigNetSim/Makefile charm-5.9-backup/examples/pose/BigNetSim/Makefile |
399 |
+--- charm-5.9/examples/pose/BigNetSim/Makefile 2004-10-17 22:48:10.000000000 +0000 |
400 |
++++ charm-5.9-backup/examples/pose/BigNetSim/Makefile 2005-09-27 03:27:08.000000000 +0000 |
401 |
+@@ -16,8 +16,8 @@ |
402 |
+ |
403 |
+ CHARMBASE=../../../ |
404 |
+ #CHARMBASE=/expand8/home/gzheng/old/charm-6-8/net-linux/ |
405 |
+-CHARMBIN=$(CHARMBASE)/bin |
406 |
+-CHARMINC=$(CHARMBASE)/include |
407 |
++CHARMBIN=/usr/bin |
408 |
++CHARMINC=/usr/include/charm-5.9 |
409 |
+ |
410 |
+ ifeq ($(SEQUENTIAL),1) |
411 |
+ CHARMC=$(CHARMBIN)/charmc -I$(CHARMINC)/pose $(OPTS) -DSEQUENTIAL_POSE=1 |
412 |
+diff -Naur charm-5.9/examples/pose/ChunkSim/Makefile charm-5.9-backup/examples/pose/ChunkSim/Makefile |
413 |
+--- charm-5.9/examples/pose/ChunkSim/Makefile 2004-10-12 17:12:26.000000000 +0000 |
414 |
++++ charm-5.9-backup/examples/pose/ChunkSim/Makefile 2005-09-27 03:27:08.000000000 +0000 |
415 |
+@@ -12,8 +12,8 @@ |
416 |
+ OPTS=-O#-DCMK_OPTIMIZE=1 -DCMK_MEMCHECKS_OFF=1 |
417 |
+ |
418 |
+ CHARMBASE=../../../ |
419 |
+-CHARMBIN=$(CHARMBASE)/bin |
420 |
+-CHARMINC=$(CHARMBASE)/include |
421 |
++CHARMBIN=/usr/bin |
422 |
++CHARMINC=/usr/include/charm-5.9 |
423 |
+ |
424 |
+ CHARMC=$(CHARMBIN)/charmc -I$(CHARMINC)/pose $(OPTS) |
425 |
+ |
426 |
+@@ -109,4 +109,4 @@ |
427 |
+ $(CHARMBIN)/etrans.pl Worker |
428 |
+ |
429 |
+ test: |
430 |
+- ./pgm 1000 10 1 RANDOM SPARSE 50 -gf 344 |
431 |
+\ No newline at end of file |
432 |
++ ./pgm 1000 10 1 RANDOM SPARSE 50 -gf 344 |
433 |
+diff -Naur charm-5.9/examples/pose/HiSim/Makefile.common charm-5.9-backup/examples/pose/HiSim/Makefile.common |
434 |
+--- charm-5.9/examples/pose/HiSim/Makefile.common 2004-11-02 07:29:40.000000000 +0000 |
435 |
++++ charm-5.9-backup/examples/pose/HiSim/Makefile.common 2005-09-27 03:27:08.000000000 +0000 |
436 |
+@@ -1,8 +1,8 @@ |
437 |
+ |
438 |
+ CHARMBASE=../../../../ |
439 |
+ #CHARMBASE=/expand8/home/gzheng/tmp/pose/charm/net-linux |
440 |
+-CHARMBIN=$(CHARMBASE)/bin |
441 |
+-CHARMINC=$(CHARMBASE)/include |
442 |
++CHARMBIN=/usr/bin |
443 |
++CHARMINC=/usr/include/charm-5.9 |
444 |
+ ETRANS=$(CHARMBIN)/etrans.pl |
445 |
+ OPTS=-g |
446 |
+ |
447 |
+diff -Naur charm-5.9/examples/pose/LBSim/Makefile charm-5.9-backup/examples/pose/LBSim/Makefile |
448 |
+--- charm-5.9/examples/pose/LBSim/Makefile 2004-11-04 04:30:45.000000000 +0000 |
449 |
++++ charm-5.9-backup/examples/pose/LBSim/Makefile 2005-09-27 03:27:08.000000000 +0000 |
450 |
+@@ -12,8 +12,8 @@ |
451 |
+ OPTS=-O#-DCMK_OPTIMIZE=1 -DCMK_MEMCHECKS_OFF=1 |
452 |
+ |
453 |
+ CHARMBASE=../../../ |
454 |
+-CHARMBIN=$(CHARMBASE)/bin |
455 |
+-CHARMINC=$(CHARMBASE)/include |
456 |
++CHARMBIN=/usr/bin |
457 |
++CHARMINC=/usr/include/charm-5.9 |
458 |
+ |
459 |
+ CHARMC=$(CHARMBIN)/charmc -I$(CHARMINC)/pose $(OPTS) |
460 |
+ |
461 |
+diff -Naur charm-5.9/examples/pose/Ring/Makefile charm-5.9-backup/examples/pose/Ring/Makefile |
462 |
+--- charm-5.9/examples/pose/Ring/Makefile 2005-02-08 18:58:05.000000000 +0000 |
463 |
++++ charm-5.9-backup/examples/pose/Ring/Makefile 2005-09-27 03:27:08.000000000 +0000 |
464 |
+@@ -12,8 +12,8 @@ |
465 |
+ OPTS=-O#-DCMK_OPTIMIZE=1 -DCMK_MEMCHECKS_OFF=1 |
466 |
+ |
467 |
+ CHARMBASE=../../.. |
468 |
+-CHARMBIN=$(CHARMBASE)/bin |
469 |
+-CHARMINC=$(CHARMBASE)/include |
470 |
++CHARMBIN=/usr/bin/ |
471 |
++CHARMINC=/usr/include/charm-5.9 |
472 |
+ |
473 |
+ CHARMC=$(CHARMBIN)/charmc -I$(CHARMINC)/pose $(OPTS) |
474 |
+ |
475 |
+diff -Naur charm-5.9/examples/pose/SimBenchmark/Makefile charm-5.9-backup/examples/pose/SimBenchmark/Makefile |
476 |
+--- charm-5.9/examples/pose/SimBenchmark/Makefile 2005-03-17 22:31:41.000000000 +0000 |
477 |
++++ charm-5.9-backup/examples/pose/SimBenchmark/Makefile 2005-09-27 03:27:08.000000000 +0000 |
478 |
+@@ -12,8 +12,8 @@ |
479 |
+ OPTS=-O#-DCMK_OPTIMIZE=1 -DCMK_MEMCHECKS_OFF=1 |
480 |
+ |
481 |
+ CHARMBASE=../../.. |
482 |
+-CHARMBIN=$(CHARMBASE)/bin |
483 |
+-CHARMINC=$(CHARMBASE)/include |
484 |
++CHARMBIN=/usr/bin |
485 |
++CHARMINC=/usr/include/charm-5.9 |
486 |
+ |
487 |
+ CHARMC=$(CHARMBIN)/charmc -I$(CHARMINC)/pose $(OPTS) |
488 |
+ |
489 |
|
490 |
diff --git a/sys-cluster/charm/files/charm-fpic-gentoo.patch b/sys-cluster/charm/files/charm-fpic-gentoo.patch |
491 |
new file mode 100644 |
492 |
index 0000000..e70874d |
493 |
--- /dev/null |
494 |
+++ b/sys-cluster/charm/files/charm-fpic-gentoo.patch |
495 |
@@ -0,0 +1,32 @@ |
496 |
+# compile with -fPIC to avoid TEXTRELs |
497 |
+ |
498 |
+--- charm-5.9/src/arch/net-linux/conv-mach.sh 2005-04-22 01:14:55.000000000 +0000 |
499 |
++++ charm-5.9-backup/src/arch/net-linux/conv-mach.sh 2005-09-27 18:07:10.000000000 +0000 |
500 |
+@@ -1,8 +1,8 @@ |
501 |
+ CMK_CPP_CHARM="/lib/cpp -P" |
502 |
+ CMK_CPP_C="gcc -E" |
503 |
+-CMK_CC="gcc " |
504 |
+-CMK_CXX="g++ " |
505 |
+-CMK_CXXPP="$CMK_CXX -x c++ -E " |
506 |
++CMK_CC="gcc -fPIC" |
507 |
++CMK_CXX="g++ -fPIC -Wno-deprecated" |
508 |
++CMK_CXXPP="$CMK_CXX -E " |
509 |
+ CMK_CF77="g77 " |
510 |
+ CMK_CF90="f90 " |
511 |
+ CMK_CF90_FIXED="$CMK_CF90 -W132 " |
512 |
+@@ -10,12 +10,12 @@ |
513 |
+ CMK_LIBS="-lckqt" |
514 |
+ #CMK_LD="$CMK_CC -Wl,--allow-multiple-definition " |
515 |
+ #CMK_LDXX="$CMK_CXX -Wl,--allow-multiple-definition " |
516 |
+-CMK_LD="$CMK_CC " |
517 |
+-CMK_LDXX="$CMK_CXX " |
518 |
++CMK_LD="gcc " |
519 |
++CMK_LDXX="g++ " |
520 |
+ CMK_LD_SHARED="-shared" |
521 |
+ CMK_LD_LIBRARY_PATH="-Wl,-rpath,$CHARMLIBSO/" |
522 |
+ CMK_XIOPTS="" |
523 |
+-CMK_F90LIBS="-L/usr/absoft/lib -L/opt/absoft/lib -lf90math -lfio -lU77 -lf77math " |
524 |
++CMK_F90LIBS="" |
525 |
+ CMK_F77LIBS="-lg2c " |
526 |
+ CMK_MOD_NAME_ALLCAPS=1 |
527 |
+ CMK_MOD_EXT="mod" |
528 |
|
529 |
diff --git a/sys-cluster/charm/files/charm-python-configure-gentoo.patch b/sys-cluster/charm/files/charm-python-configure-gentoo.patch |
530 |
new file mode 100644 |
531 |
index 0000000..6e98642 |
532 |
--- /dev/null |
533 |
+++ b/sys-cluster/charm/files/charm-python-configure-gentoo.patch |
534 |
@@ -0,0 +1,29 @@ |
535 |
+# include proper python headers |
536 |
+ |
537 |
+--- charm-5.9/src/scripts/configure 2005-06-01 03:46:06.000000000 +0000 |
538 |
++++ charm-5.9-backup/src/scripts/configure 2005-09-27 14:28:48.000000000 +0000 |
539 |
+@@ -1970,11 +1970,12 @@ |
540 |
+ fi |
541 |
+ |
542 |
+ #### test if Python headers are installed #### |
543 |
++PYTHON_VERSION=`python -V 2>&1 | awk {'print $2'} | awk -F. {'print $1"."$2'}` |
544 |
+ cat > $t <<EOT |
545 |
+-#include "python/Python.h" |
546 |
+-#include "python/compile.h" |
547 |
+-#include "python/eval.h" |
548 |
+-#include "python/node.h" |
549 |
++#include "python${PYTHON_VERSION}/Python.h" |
550 |
++#include "python${PYTHON_VERSION}/compile.h" |
551 |
++#include "python${PYTHON_VERSION}/eval.h" |
552 |
++#include "python${PYTHON_VERSION}/node.h" |
553 |
+ |
554 |
+ int main() { |
555 |
+ Py_Initialize(); |
556 |
+@@ -1983,7 +1984,6 @@ |
557 |
+ PyCodeObject *program = PyNode_Compile(programNode, ""); |
558 |
+ } |
559 |
+ EOT |
560 |
+-PYTHON_VERSION=`python -V 2>&1 | awk {'print $2'} | awk -F. {'print $1"."$2'}` |
561 |
+ test_link "whether Python is installed" "yes" "no" "-lpython$PYTHON_VERSION -lpthread -lutil -ldl" |
562 |
+ |
563 |
+ cat >>confdefs.h <<_ACEOF |
564 |
|
565 |
diff --git a/sys-cluster/charm/metadata.xml b/sys-cluster/charm/metadata.xml |
566 |
new file mode 100644 |
567 |
index 0000000..be41516 |
568 |
--- /dev/null |
569 |
+++ b/sys-cluster/charm/metadata.xml |
570 |
@@ -0,0 +1,9 @@ |
571 |
+<?xml version="1.0" encoding="UTF-8"?> |
572 |
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
573 |
+<pkgmetadata> |
574 |
+ <herd>sci</herd> |
575 |
+ <use> |
576 |
+ <flag name='cmkopt'>Enable CMK optimisation</flag> |
577 |
+ <flag name='tcp'>Use TCP (instead of UPD) for socket communication</flag> |
578 |
+ </use> |
579 |
+</pkgmetadata> |