1 |
commit: aafd89b771c91953be8763b52496677212ba7844 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 1 08:38:42 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 1 09:07:00 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aafd89b7 |
7 |
|
8 |
sys-cluster/charm: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
sys-cluster/charm/Manifest | 4 - |
13 |
sys-cluster/charm/charm-6.5.1-r3.ebuild | 211 ----------- |
14 |
sys-cluster/charm/charm-6.6.0-r1.ebuild | 208 ----------- |
15 |
sys-cluster/charm/charm-6.6.0.ebuild | 208 ----------- |
16 |
sys-cluster/charm/charm-6.6.1.ebuild | 217 ----------- |
17 |
sys-cluster/charm/charm-6.7.1.ebuild | 215 ----------- |
18 |
.../charm/files/charm-6.5.1-CkReductionMgr.patch | 34 -- |
19 |
.../charm/files/charm-6.5.1-cleanup-config.patch | 58 --- |
20 |
.../files/charm-6.5.1-fix-markupSanitizer.patch | 203 ----------- |
21 |
.../files/charm-6.5.1-fix-navmenuGenerator.patch | 30 -- |
22 |
.../files/charm-6.5.1-fix-string-parsing.patch | 50 --- |
23 |
.../files/charm-6.5.1-static-library-fix.patch | 396 --------------------- |
24 |
12 files changed, 1834 deletions(-) |
25 |
|
26 |
diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest |
27 |
index 22a65c722b3..9019144cedc 100644 |
28 |
--- a/sys-cluster/charm/Manifest |
29 |
+++ b/sys-cluster/charm/Manifest |
30 |
@@ -1,5 +1 @@ |
31 |
-DIST charm-6.5.1.tar.gz 19265741 BLAKE2B a0124b2c125b85968d79496709e3aa64e6287f8897cffb261f908b0e4e002a973421b98dfe24eeeadf3bc5ead0da40b3ebd10e3f951b231971231eba659405cf SHA512 1a25c76f3699e30d0614e85f39ea0f594896cbc299b0e670c52fcea176171e8834ea7f9ba3ba0c1957598b0f1cbfa6a4ed9279ae0c030fa32faa6acca879b694 |
32 |
-DIST charm-6.6.0.tar.gz 18779545 BLAKE2B 7fef3e34060e6e76d757b432646da25d0869600db1ab6a39bd1a0be0d6bd59bf656fd16e5e9550f5d081333e0c458f001236016a966537c3803d52b125694d5f SHA512 fd6cc2fa8919198fdceb8187101882a61fe974fed3ddd65b102c95b850877429fe0675a55d54075e4a2accad134f615ff717a7dd39fbd9af5fa65a5c87d34e0b |
33 |
-DIST charm-6.6.1.tar.gz 125697465 BLAKE2B 49cdab682ddb2c5409007f852b9d2d905921a5db04aaa7a4d679f9cf05f754864be5b2c885c070d8c7f35a78584055e38993397430617f6aebfe398d415df6c4 SHA512 139409fff76ac9811b2efe6605579a877738f873b112d4e4da25f079598f6c238cf76e677ed3cf3f92aa59f29710feea3e96e59e6010e186e4191dfa4c3ef92e |
34 |
-DIST charm-6.7.1.tar.gz 18843211 BLAKE2B 090959b5dd8642fecf6dff7bf24212a42b39d7940c264a0b37af9c2ae8f1ac32f3c65d22a67cdc78b7cd821523dc01659293c84e9b26fa69669915d9c5b3f4db SHA512 08581ad58ea737bb118ad1d382feeae2cec2ec0fd8ea1a227e2cb8080c40ba0d043de6c867de0dfa470b2291638b1b6bf6d52c89b4e4b6c9f1fdd824ac601436 |
35 |
DIST charm-6.8.2.tar.gz 24420478 BLAKE2B b5035d29f90ec766dc49b94e76d68a9ce3d16f43037203baaa035cfa863c6ca063a81c5dc275c1517feabc3517201d5e854a2b1b4b1c492ff0433f692db39a34 SHA512 903aa47706c260d35a04e6002874d197439087d6bdbd4fe65a397a02096a2e53eeb93b64c57e5983f0190ca2dcef3a9b28a3b424207c9d3eb6e820659f5e00c1 |
36 |
|
37 |
diff --git a/sys-cluster/charm/charm-6.5.1-r3.ebuild b/sys-cluster/charm/charm-6.5.1-r3.ebuild |
38 |
deleted file mode 100644 |
39 |
index 5cf9b4f6cb0..00000000000 |
40 |
--- a/sys-cluster/charm/charm-6.5.1-r3.ebuild |
41 |
+++ /dev/null |
42 |
@@ -1,211 +0,0 @@ |
43 |
-# Copyright 1999-2016 Gentoo Foundation |
44 |
-# Distributed under the terms of the GNU General Public License v2 |
45 |
- |
46 |
-EAPI=5 |
47 |
- |
48 |
-PYTHON_COMPAT=( python2_7 ) |
49 |
- |
50 |
-inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs python-any-r1 |
51 |
- |
52 |
-DESCRIPTION="Message-passing parallel language and runtime system" |
53 |
-HOMEPAGE="http://charm.cs.uiuc.edu/" |
54 |
-SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz" |
55 |
- |
56 |
-LICENSE="charm" |
57 |
-SLOT="0" |
58 |
-KEYWORDS="~amd64 ~x86" |
59 |
-IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mlogft mpi numa smp static-libs syncft tcp" |
60 |
- |
61 |
-RDEPEND="mpi? ( virtual/mpi )" |
62 |
-DEPEND=" |
63 |
- ${RDEPEND} |
64 |
- doc? ( |
65 |
- >=app-text/poppler-0.12.3-r3[utils] |
66 |
- dev-tex/latex2html |
67 |
- virtual/tex-base |
68 |
- $(python_gen_any_dep ' |
69 |
- >=dev-python/beautifulsoup-4[${PYTHON_USEDEP}] |
70 |
- dev-python/lxml[${PYTHON_USEDEP}] |
71 |
- ') |
72 |
- media-libs/netpbm |
73 |
- ${PYTHON_DEPS} |
74 |
- )" |
75 |
- |
76 |
-REQUIRED_USE=" |
77 |
- cmkopt? ( !charmdebug !charmtracing ) |
78 |
- charmproduction? ( !charmdebug !charmtracing )" |
79 |
- |
80 |
-FORTRAN_STANDARD="90" |
81 |
- |
82 |
-pkg_setup() { |
83 |
- use doc && python-any-r1_pkg_setup |
84 |
-} |
85 |
- |
86 |
-get_opts() { |
87 |
- local CHARM_OPTS |
88 |
- |
89 |
- # TCP instead of default UDP for socket comunication |
90 |
- # protocol |
91 |
- CHARM_OPTS+="$(usex tcp ' tcp' '')" |
92 |
- |
93 |
- # enable direct SMP support using shared memory |
94 |
- CHARM_OPTS+="$(usex smp ' smp' '')" |
95 |
- |
96 |
- CHARM_OPTS+="$(usex mlogft ' mlogft' '')" |
97 |
- CHARM_OPTS+="$(usex syncft ' syncft' '')" |
98 |
- |
99 |
- # Build shared libraries by default. |
100 |
- CHARM_OPTS+=" --build-shared" |
101 |
- |
102 |
- if use charmproduction; then |
103 |
- CHARM_OPTS+=" --with-production" |
104 |
- else |
105 |
- if use charmdebug; then |
106 |
- CHARM_OPTS+=" --enable-charmdebug" |
107 |
- fi |
108 |
- |
109 |
- if use charmtracing; then |
110 |
- CHARM_OPTS+=" --enable-tracing --enable-tracing-commthread" |
111 |
- fi |
112 |
- fi |
113 |
- |
114 |
- CHARM_OPTS+="$(usex numa ' --with-numa' '')" |
115 |
- echo $CHARM_OPTS |
116 |
-} |
117 |
- |
118 |
-src_prepare() { |
119 |
- sed \ |
120 |
- -e "/CMK_CF90/s:f90:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ |
121 |
- -e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \ |
122 |
- -e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \ |
123 |
- -e '/CMK_F90_MODINC/s:-p:-I:g' \ |
124 |
- -e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \ |
125 |
- -i src/arch/$(usex mpi "mpi" "net")-linux*/*sh || die |
126 |
- |
127 |
- sed \ |
128 |
- -e "s:-o conv-cpm:${LDFLAGS} &:g" \ |
129 |
- -e "s:-o charmxi:${LDFLAGS} &:g" \ |
130 |
- -e "s:-o charmrun-silent:${LDFLAGS} &:g" \ |
131 |
- -e "s:-o charmrun-notify:${LDFLAGS} &:g" \ |
132 |
- -e "s:-o charmrun:${LDFLAGS} &:g" \ |
133 |
- -e "s:-o charmd_faceless:${LDFLAGS} &:g" \ |
134 |
- -e "s:-o charmd:${LDFLAGS} &:g" \ |
135 |
- -i \ |
136 |
- src/scripts/Makefile \ |
137 |
- src/arch/net/charmrun/Makefile || die |
138 |
- |
139 |
- # CMK optimization |
140 |
- use cmkopt && append-cppflags -DCMK_OPTIMIZE=1 |
141 |
- |
142 |
- # Fix QA notice. Filed report with upstream. |
143 |
- append-cflags -DALLOCA_H |
144 |
- |
145 |
- epatch "${FILESDIR}/charm-6.5.1-cleanup-config.patch" |
146 |
- epatch "${FILESDIR}/charm-6.5.1-CkReductionMgr.patch" |
147 |
- epatch "${FILESDIR}/charm-6.5.1-fix-string-parsing.patch" |
148 |
- epatch "${FILESDIR}/charm-6.5.1-fix-navmenuGenerator.patch" |
149 |
- epatch "${FILESDIR}/charm-6.5.1-fix-markupSanitizer.patch" |
150 |
- epatch "${FILESDIR}/charm-6.5.1-static-library-fix.patch" |
151 |
-} |
152 |
- |
153 |
-src_compile() { |
154 |
- local mybuildoptions="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') $(get_opts) ${MAKEOPTS} -j1 ${CFLAGS}" |
155 |
- |
156 |
- # Build charmm++ first. |
157 |
- einfo "running ./build charm++ ${mybuildoptions}" |
158 |
- ./build charm++ ${mybuildoptions} || die "Failed to build charm++" |
159 |
- |
160 |
- # make pdf/html docs |
161 |
- if use doc; then |
162 |
- emake -j1 -C doc/charm++ |
163 |
- fi |
164 |
-} |
165 |
- |
166 |
-src_test() { |
167 |
- make -C tests/charm++ test TESTOPTS="++local" || die |
168 |
-} |
169 |
- |
170 |
-src_install() { |
171 |
- # Make charmc play well with gentoo before we move it into /usr/bin. This |
172 |
- # patch cannot be applied during src_prepare() because the charmc wrapper |
173 |
- # is used during building. |
174 |
- epatch "${FILESDIR}/charm-6.5.1-charmc-gentoo.patch" |
175 |
- |
176 |
- sed -e "s|gentoo-include|${P}|" \ |
177 |
- -e "s|gentoo-libdir|$(get_libdir)|g" \ |
178 |
- -e "s|VERSION|${P}/VERSION|" \ |
179 |
- -i ./src/scripts/charmc || die "failed patching charmc script" |
180 |
- |
181 |
- # In the following, some of the files are symlinks to ../tmp which we need |
182 |
- # to dereference first (see bug 432834). |
183 |
- |
184 |
- local i |
185 |
- |
186 |
- # Install binaries. |
187 |
- for i in bin/*; do |
188 |
- if [[ -L ${i} ]]; then |
189 |
- i=$(readlink -e "${i}") || die |
190 |
- fi |
191 |
- dobin "${i}" |
192 |
- done |
193 |
- |
194 |
- # Install headers. |
195 |
- insinto /usr/include/${P} |
196 |
- for i in include/*; do |
197 |
- if [[ -L ${i} ]]; then |
198 |
- i=$(readlink -e "${i}") || die |
199 |
- fi |
200 |
- doins "${i}" |
201 |
- done |
202 |
- |
203 |
- # Install static libs. Charm has a lot of .o "libs" that it requires at |
204 |
- # runtime. |
205 |
- if use static-libs; then |
206 |
- for i in lib/*.{a,o}; do |
207 |
- if [[ -L ${i} ]]; then |
208 |
- i=$(readlink -e "${i}") || die |
209 |
- fi |
210 |
- dolib "${i}" |
211 |
- done |
212 |
- fi |
213 |
- |
214 |
- # Install shared libs. |
215 |
- for i in lib_so/*; do |
216 |
- if [[ -L ${i} ]]; then |
217 |
- i=$(readlink -e "${i}") || die |
218 |
- fi |
219 |
- dolib.so "${i}" |
220 |
- done |
221 |
- |
222 |
- # Basic docs. |
223 |
- dodoc CHANGES README |
224 |
- |
225 |
- # Install examples. |
226 |
- if use examples; then |
227 |
- find examples/ -name 'Makefile' | xargs sed \ |
228 |
- -r "s:(../)+bin/charmc:/usr/bin/charmc:" -i || \ |
229 |
- die "Failed to fix examples" |
230 |
- find examples/ -name 'Makefile' | xargs sed \ |
231 |
- -r "s:./charmrun:./charmrun ++local:" -i || \ |
232 |
- die "Failed to fix examples" |
233 |
- insinto /usr/share/doc/${PF}/examples |
234 |
- doins -r examples/charm++/* |
235 |
- fi |
236 |
- |
237 |
- # Install pdf/html docs |
238 |
- if use doc; then |
239 |
- cd "${S}/doc/charm++" |
240 |
- # Install pdfs. |
241 |
- insinto /usr/share/doc/${PF}/pdf |
242 |
- doins *.pdf |
243 |
- # Install html. |
244 |
- docinto html |
245 |
- dohtml -r manual/* |
246 |
- fi |
247 |
-} |
248 |
- |
249 |
-pkg_postinst() { |
250 |
- einfo "Please test your charm installation by copying the" |
251 |
- einfo "content of /usr/share/doc/${PF}/examples to a" |
252 |
- einfo "temporary location and run 'make test'." |
253 |
-} |
254 |
|
255 |
diff --git a/sys-cluster/charm/charm-6.6.0-r1.ebuild b/sys-cluster/charm/charm-6.6.0-r1.ebuild |
256 |
deleted file mode 100644 |
257 |
index b6347d0be60..00000000000 |
258 |
--- a/sys-cluster/charm/charm-6.6.0-r1.ebuild |
259 |
+++ /dev/null |
260 |
@@ -1,208 +0,0 @@ |
261 |
-# Copyright 1999-2016 Gentoo Foundation |
262 |
-# Distributed under the terms of the GNU General Public License v2 |
263 |
- |
264 |
-EAPI=5 |
265 |
- |
266 |
-FORTRAN_STANDARD="90" |
267 |
-PYTHON_COMPAT=( python2_7 ) |
268 |
- |
269 |
-inherit eutils flag-o-matic fortran-2 multilib multiprocessing python-any-r1 toolchain-funcs |
270 |
- |
271 |
-DESCRIPTION="Message-passing parallel language and runtime system" |
272 |
-HOMEPAGE="http://charm.cs.uiuc.edu/" |
273 |
-SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz" |
274 |
- |
275 |
-LICENSE="charm" |
276 |
-SLOT="0" |
277 |
-KEYWORDS="~amd64 ~x86" |
278 |
-IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mlogft mpi numa smp static-libs syncft tcp" |
279 |
- |
280 |
-RDEPEND="mpi? ( virtual/mpi )" |
281 |
-DEPEND=" |
282 |
- ${RDEPEND} |
283 |
- doc? ( |
284 |
- >=app-text/poppler-0.12.3-r3[utils] |
285 |
- dev-tex/latex2html |
286 |
- virtual/tex-base |
287 |
- $(python_gen_any_dep ' |
288 |
- >=dev-python/beautifulsoup-4[${PYTHON_USEDEP}] |
289 |
- dev-python/lxml[${PYTHON_USEDEP}] |
290 |
- ') |
291 |
- media-libs/netpbm |
292 |
- ${PYTHON_DEPS} |
293 |
- )" |
294 |
- |
295 |
-REQUIRED_USE=" |
296 |
- cmkopt? ( !charmdebug !charmtracing ) |
297 |
- charmproduction? ( !charmdebug !charmtracing )" |
298 |
- |
299 |
-pkg_setup() { |
300 |
- use doc && python-any-r1_pkg_setup |
301 |
-} |
302 |
- |
303 |
-get_opts() { |
304 |
- local CHARM_OPTS |
305 |
- |
306 |
- # TCP instead of default UDP for socket comunication |
307 |
- # protocol |
308 |
- CHARM_OPTS+="$(usex tcp ' tcp' '')" |
309 |
- |
310 |
- # enable direct SMP support using shared memory |
311 |
- CHARM_OPTS+="$(usex smp ' smp' '')" |
312 |
- |
313 |
- CHARM_OPTS+="$(usex mlogft ' mlogft' '')" |
314 |
- CHARM_OPTS+="$(usex syncft ' syncft' '')" |
315 |
- |
316 |
- # Build shared libraries by default. |
317 |
- CHARM_OPTS+=" --build-shared" |
318 |
- |
319 |
- if use charmproduction; then |
320 |
- CHARM_OPTS+=" --with-production" |
321 |
- else |
322 |
- if use charmdebug; then |
323 |
- CHARM_OPTS+=" --enable-charmdebug" |
324 |
- fi |
325 |
- |
326 |
- if use charmtracing; then |
327 |
- CHARM_OPTS+=" --enable-tracing --enable-tracing-commthread" |
328 |
- fi |
329 |
- fi |
330 |
- |
331 |
- CHARM_OPTS+="$(usex numa ' --with-numa' '')" |
332 |
- echo $CHARM_OPTS |
333 |
-} |
334 |
- |
335 |
-src_prepare() { |
336 |
- sed \ |
337 |
- -e "/CMK_CF77/s:[fg]77:$(usex mpi "mpif90" "$(tc-getF77)"):g" \ |
338 |
- -e "/CMK_CF90/s:f95:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ |
339 |
- -e "/CMK_CF90/s:\`which f90.*$::g" \ |
340 |
- -e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \ |
341 |
- -e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \ |
342 |
- -e '/CMK_F90_MODINC/s:-p:-I:g' \ |
343 |
- -e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \ |
344 |
- -i src/arch/$(usex mpi "mpi" "net")*-linux*/*sh || die |
345 |
- sed \ |
346 |
- -e "/CMK_CF90/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ |
347 |
- -e "/F90DIR/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ |
348 |
- -e "/f95target/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ |
349 |
- -e "/f95version/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ |
350 |
- -i src/arch/common/*.sh || die |
351 |
- |
352 |
- sed \ |
353 |
- -e "s:-o conv-cpm:${LDFLAGS} &:g" \ |
354 |
- -e "s:-o charmxi:${LDFLAGS} &:g" \ |
355 |
- -e "s:-o charmrun-silent:${LDFLAGS} &:g" \ |
356 |
- -e "s:-o charmrun-notify:${LDFLAGS} &:g" \ |
357 |
- -e "s:-o charmrun:${LDFLAGS} &:g" \ |
358 |
- -e "s:-o charmd_faceless:${LDFLAGS} &:g" \ |
359 |
- -e "s:-o charmd:${LDFLAGS} &:g" \ |
360 |
- -i \ |
361 |
- src/scripts/Makefile \ |
362 |
- src/util/charmrun-src/Makefile || die |
363 |
- |
364 |
- # CMK optimization |
365 |
- use cmkopt && append-cppflags -DCMK_OPTIMIZE=1 |
366 |
- |
367 |
- # Fix QA notice. Filed report with upstream. |
368 |
- append-cflags -DALLOCA_H |
369 |
- |
370 |
- epatch "${FILESDIR}/charm-6.5.1-fix-navmenuGenerator.patch" |
371 |
- epatch "${FILESDIR}/charm-6.5.1-fix-markupSanitizer.patch" |
372 |
-} |
373 |
- |
374 |
-src_compile() { |
375 |
- local build_version="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '')" |
376 |
- local build_options="$(get_opts)" |
377 |
- #build only accepts -j from MAKEOPTS |
378 |
- local build_commandline="${build_version} ${build_options} -j$(makeopts_jobs)" |
379 |
- |
380 |
- # Build charmm++ first. |
381 |
- einfo "running ./build charm++ ${build_commandline}" |
382 |
- ./build charm++ ${build_commandline} || die "Failed to build charm++" |
383 |
- |
384 |
- # make pdf/html docs |
385 |
- if use doc; then |
386 |
- emake -j1 -C doc/charm++ |
387 |
- fi |
388 |
-} |
389 |
- |
390 |
-src_test() { |
391 |
- make -C tests/charm++ test TESTOPTS="++local" || die |
392 |
-} |
393 |
- |
394 |
-src_install() { |
395 |
- # Make charmc play well with gentoo before we move it into /usr/bin. This |
396 |
- # patch cannot be applied during src_prepare() because the charmc wrapper |
397 |
- # is used during building. |
398 |
- epatch "${FILESDIR}/charm-6.5.1-charmc-gentoo.patch" |
399 |
- |
400 |
- sed -e "s|gentoo-include|${P}|" \ |
401 |
- -e "s|gentoo-libdir|$(get_libdir)|g" \ |
402 |
- -e "s|VERSION|${P}/VERSION|" \ |
403 |
- -i ./src/scripts/charmc || die "failed patching charmc script" |
404 |
- |
405 |
- # In the following, some of the files are symlinks to ../tmp which we need |
406 |
- # to dereference first (see bug 432834). |
407 |
- |
408 |
- local i |
409 |
- |
410 |
- # Install binaries. |
411 |
- for i in bin/*; do |
412 |
- if [[ -L ${i} ]]; then |
413 |
- i=$(readlink -e "${i}") || die |
414 |
- fi |
415 |
- dobin "${i}" |
416 |
- done |
417 |
- |
418 |
- # Install headers. |
419 |
- insinto /usr/include/${P} |
420 |
- for i in include/*; do |
421 |
- if [[ -L ${i} ]]; then |
422 |
- i=$(readlink -e "${i}") || die |
423 |
- fi |
424 |
- doins "${i}" |
425 |
- done |
426 |
- |
427 |
- # Install libs incl. charm objects |
428 |
- for i in lib*/*.{so,o,a}; do |
429 |
- [[ ${i} = *.a ]] && use !static-libs && continue |
430 |
- if [[ -L ${i} ]]; then |
431 |
- i=$(readlink -e "${i}") || die |
432 |
- fi |
433 |
- [[ ${i} = *.so ]] && dolib.so "${i}" || dolib "${i}" |
434 |
- done |
435 |
- |
436 |
- # Basic docs. |
437 |
- dodoc CHANGES README |
438 |
- |
439 |
- # Install examples. |
440 |
- if use examples; then |
441 |
- find examples/ -name 'Makefile' | xargs sed \ |
442 |
- -r "s:(../)+bin/charmc:/usr/bin/charmc:" -i || \ |
443 |
- die "Failed to fix examples" |
444 |
- find examples/ -name 'Makefile' | xargs sed \ |
445 |
- -r "s:./charmrun:./charmrun ++local:" -i || \ |
446 |
- die "Failed to fix examples" |
447 |
- insinto /usr/share/doc/${PF}/examples |
448 |
- doins -r examples/charm++/* |
449 |
- docompress -x /usr/share/doc/${PF}/examples |
450 |
- fi |
451 |
- |
452 |
- # Install pdf/html docs |
453 |
- if use doc; then |
454 |
- cd "${S}/doc/charm++" |
455 |
- # Install pdfs. |
456 |
- insinto /usr/share/doc/${PF}/pdf |
457 |
- doins *.pdf |
458 |
- # Install html. |
459 |
- docinto html |
460 |
- dohtml -r manual/* |
461 |
- fi |
462 |
-} |
463 |
- |
464 |
-pkg_postinst() { |
465 |
- einfo "Please test your charm installation by copying the" |
466 |
- einfo "content of /usr/share/doc/${PF}/examples to a" |
467 |
- einfo "temporary location and run 'make test'." |
468 |
-} |
469 |
|
470 |
diff --git a/sys-cluster/charm/charm-6.6.0.ebuild b/sys-cluster/charm/charm-6.6.0.ebuild |
471 |
deleted file mode 100644 |
472 |
index b6347d0be60..00000000000 |
473 |
--- a/sys-cluster/charm/charm-6.6.0.ebuild |
474 |
+++ /dev/null |
475 |
@@ -1,208 +0,0 @@ |
476 |
-# Copyright 1999-2016 Gentoo Foundation |
477 |
-# Distributed under the terms of the GNU General Public License v2 |
478 |
- |
479 |
-EAPI=5 |
480 |
- |
481 |
-FORTRAN_STANDARD="90" |
482 |
-PYTHON_COMPAT=( python2_7 ) |
483 |
- |
484 |
-inherit eutils flag-o-matic fortran-2 multilib multiprocessing python-any-r1 toolchain-funcs |
485 |
- |
486 |
-DESCRIPTION="Message-passing parallel language and runtime system" |
487 |
-HOMEPAGE="http://charm.cs.uiuc.edu/" |
488 |
-SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz" |
489 |
- |
490 |
-LICENSE="charm" |
491 |
-SLOT="0" |
492 |
-KEYWORDS="~amd64 ~x86" |
493 |
-IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mlogft mpi numa smp static-libs syncft tcp" |
494 |
- |
495 |
-RDEPEND="mpi? ( virtual/mpi )" |
496 |
-DEPEND=" |
497 |
- ${RDEPEND} |
498 |
- doc? ( |
499 |
- >=app-text/poppler-0.12.3-r3[utils] |
500 |
- dev-tex/latex2html |
501 |
- virtual/tex-base |
502 |
- $(python_gen_any_dep ' |
503 |
- >=dev-python/beautifulsoup-4[${PYTHON_USEDEP}] |
504 |
- dev-python/lxml[${PYTHON_USEDEP}] |
505 |
- ') |
506 |
- media-libs/netpbm |
507 |
- ${PYTHON_DEPS} |
508 |
- )" |
509 |
- |
510 |
-REQUIRED_USE=" |
511 |
- cmkopt? ( !charmdebug !charmtracing ) |
512 |
- charmproduction? ( !charmdebug !charmtracing )" |
513 |
- |
514 |
-pkg_setup() { |
515 |
- use doc && python-any-r1_pkg_setup |
516 |
-} |
517 |
- |
518 |
-get_opts() { |
519 |
- local CHARM_OPTS |
520 |
- |
521 |
- # TCP instead of default UDP for socket comunication |
522 |
- # protocol |
523 |
- CHARM_OPTS+="$(usex tcp ' tcp' '')" |
524 |
- |
525 |
- # enable direct SMP support using shared memory |
526 |
- CHARM_OPTS+="$(usex smp ' smp' '')" |
527 |
- |
528 |
- CHARM_OPTS+="$(usex mlogft ' mlogft' '')" |
529 |
- CHARM_OPTS+="$(usex syncft ' syncft' '')" |
530 |
- |
531 |
- # Build shared libraries by default. |
532 |
- CHARM_OPTS+=" --build-shared" |
533 |
- |
534 |
- if use charmproduction; then |
535 |
- CHARM_OPTS+=" --with-production" |
536 |
- else |
537 |
- if use charmdebug; then |
538 |
- CHARM_OPTS+=" --enable-charmdebug" |
539 |
- fi |
540 |
- |
541 |
- if use charmtracing; then |
542 |
- CHARM_OPTS+=" --enable-tracing --enable-tracing-commthread" |
543 |
- fi |
544 |
- fi |
545 |
- |
546 |
- CHARM_OPTS+="$(usex numa ' --with-numa' '')" |
547 |
- echo $CHARM_OPTS |
548 |
-} |
549 |
- |
550 |
-src_prepare() { |
551 |
- sed \ |
552 |
- -e "/CMK_CF77/s:[fg]77:$(usex mpi "mpif90" "$(tc-getF77)"):g" \ |
553 |
- -e "/CMK_CF90/s:f95:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ |
554 |
- -e "/CMK_CF90/s:\`which f90.*$::g" \ |
555 |
- -e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \ |
556 |
- -e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \ |
557 |
- -e '/CMK_F90_MODINC/s:-p:-I:g' \ |
558 |
- -e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \ |
559 |
- -i src/arch/$(usex mpi "mpi" "net")*-linux*/*sh || die |
560 |
- sed \ |
561 |
- -e "/CMK_CF90/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ |
562 |
- -e "/F90DIR/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ |
563 |
- -e "/f95target/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ |
564 |
- -e "/f95version/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ |
565 |
- -i src/arch/common/*.sh || die |
566 |
- |
567 |
- sed \ |
568 |
- -e "s:-o conv-cpm:${LDFLAGS} &:g" \ |
569 |
- -e "s:-o charmxi:${LDFLAGS} &:g" \ |
570 |
- -e "s:-o charmrun-silent:${LDFLAGS} &:g" \ |
571 |
- -e "s:-o charmrun-notify:${LDFLAGS} &:g" \ |
572 |
- -e "s:-o charmrun:${LDFLAGS} &:g" \ |
573 |
- -e "s:-o charmd_faceless:${LDFLAGS} &:g" \ |
574 |
- -e "s:-o charmd:${LDFLAGS} &:g" \ |
575 |
- -i \ |
576 |
- src/scripts/Makefile \ |
577 |
- src/util/charmrun-src/Makefile || die |
578 |
- |
579 |
- # CMK optimization |
580 |
- use cmkopt && append-cppflags -DCMK_OPTIMIZE=1 |
581 |
- |
582 |
- # Fix QA notice. Filed report with upstream. |
583 |
- append-cflags -DALLOCA_H |
584 |
- |
585 |
- epatch "${FILESDIR}/charm-6.5.1-fix-navmenuGenerator.patch" |
586 |
- epatch "${FILESDIR}/charm-6.5.1-fix-markupSanitizer.patch" |
587 |
-} |
588 |
- |
589 |
-src_compile() { |
590 |
- local build_version="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '')" |
591 |
- local build_options="$(get_opts)" |
592 |
- #build only accepts -j from MAKEOPTS |
593 |
- local build_commandline="${build_version} ${build_options} -j$(makeopts_jobs)" |
594 |
- |
595 |
- # Build charmm++ first. |
596 |
- einfo "running ./build charm++ ${build_commandline}" |
597 |
- ./build charm++ ${build_commandline} || die "Failed to build charm++" |
598 |
- |
599 |
- # make pdf/html docs |
600 |
- if use doc; then |
601 |
- emake -j1 -C doc/charm++ |
602 |
- fi |
603 |
-} |
604 |
- |
605 |
-src_test() { |
606 |
- make -C tests/charm++ test TESTOPTS="++local" || die |
607 |
-} |
608 |
- |
609 |
-src_install() { |
610 |
- # Make charmc play well with gentoo before we move it into /usr/bin. This |
611 |
- # patch cannot be applied during src_prepare() because the charmc wrapper |
612 |
- # is used during building. |
613 |
- epatch "${FILESDIR}/charm-6.5.1-charmc-gentoo.patch" |
614 |
- |
615 |
- sed -e "s|gentoo-include|${P}|" \ |
616 |
- -e "s|gentoo-libdir|$(get_libdir)|g" \ |
617 |
- -e "s|VERSION|${P}/VERSION|" \ |
618 |
- -i ./src/scripts/charmc || die "failed patching charmc script" |
619 |
- |
620 |
- # In the following, some of the files are symlinks to ../tmp which we need |
621 |
- # to dereference first (see bug 432834). |
622 |
- |
623 |
- local i |
624 |
- |
625 |
- # Install binaries. |
626 |
- for i in bin/*; do |
627 |
- if [[ -L ${i} ]]; then |
628 |
- i=$(readlink -e "${i}") || die |
629 |
- fi |
630 |
- dobin "${i}" |
631 |
- done |
632 |
- |
633 |
- # Install headers. |
634 |
- insinto /usr/include/${P} |
635 |
- for i in include/*; do |
636 |
- if [[ -L ${i} ]]; then |
637 |
- i=$(readlink -e "${i}") || die |
638 |
- fi |
639 |
- doins "${i}" |
640 |
- done |
641 |
- |
642 |
- # Install libs incl. charm objects |
643 |
- for i in lib*/*.{so,o,a}; do |
644 |
- [[ ${i} = *.a ]] && use !static-libs && continue |
645 |
- if [[ -L ${i} ]]; then |
646 |
- i=$(readlink -e "${i}") || die |
647 |
- fi |
648 |
- [[ ${i} = *.so ]] && dolib.so "${i}" || dolib "${i}" |
649 |
- done |
650 |
- |
651 |
- # Basic docs. |
652 |
- dodoc CHANGES README |
653 |
- |
654 |
- # Install examples. |
655 |
- if use examples; then |
656 |
- find examples/ -name 'Makefile' | xargs sed \ |
657 |
- -r "s:(../)+bin/charmc:/usr/bin/charmc:" -i || \ |
658 |
- die "Failed to fix examples" |
659 |
- find examples/ -name 'Makefile' | xargs sed \ |
660 |
- -r "s:./charmrun:./charmrun ++local:" -i || \ |
661 |
- die "Failed to fix examples" |
662 |
- insinto /usr/share/doc/${PF}/examples |
663 |
- doins -r examples/charm++/* |
664 |
- docompress -x /usr/share/doc/${PF}/examples |
665 |
- fi |
666 |
- |
667 |
- # Install pdf/html docs |
668 |
- if use doc; then |
669 |
- cd "${S}/doc/charm++" |
670 |
- # Install pdfs. |
671 |
- insinto /usr/share/doc/${PF}/pdf |
672 |
- doins *.pdf |
673 |
- # Install html. |
674 |
- docinto html |
675 |
- dohtml -r manual/* |
676 |
- fi |
677 |
-} |
678 |
- |
679 |
-pkg_postinst() { |
680 |
- einfo "Please test your charm installation by copying the" |
681 |
- einfo "content of /usr/share/doc/${PF}/examples to a" |
682 |
- einfo "temporary location and run 'make test'." |
683 |
-} |
684 |
|
685 |
diff --git a/sys-cluster/charm/charm-6.6.1.ebuild b/sys-cluster/charm/charm-6.6.1.ebuild |
686 |
deleted file mode 100644 |
687 |
index b7c9dab265b..00000000000 |
688 |
--- a/sys-cluster/charm/charm-6.6.1.ebuild |
689 |
+++ /dev/null |
690 |
@@ -1,217 +0,0 @@ |
691 |
-# Copyright 1999-2016 Gentoo Foundation |
692 |
-# Distributed under the terms of the GNU General Public License v2 |
693 |
- |
694 |
-EAPI=5 |
695 |
- |
696 |
-FORTRAN_STANDARD="90" |
697 |
-PYTHON_COMPAT=( python2_7 ) |
698 |
- |
699 |
-inherit eutils flag-o-matic fortran-2 multilib multiprocessing python-any-r1 toolchain-funcs |
700 |
- |
701 |
-DESCRIPTION="Message-passing parallel language and runtime system" |
702 |
-HOMEPAGE="http://charm.cs.uiuc.edu/" |
703 |
-SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz" |
704 |
- |
705 |
-LICENSE="charm" |
706 |
-SLOT="0" |
707 |
-KEYWORDS="~amd64 ~x86" |
708 |
-IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mlogft mpi ampi numa smp static-libs syncft tcp" |
709 |
- |
710 |
-REQUIRED_USE="ampi? ( !mpi )" |
711 |
- |
712 |
-RDEPEND="mpi? ( virtual/mpi )" |
713 |
-DEPEND=" |
714 |
- ${RDEPEND} |
715 |
- doc? ( |
716 |
- >=app-text/poppler-0.12.3-r3[utils] |
717 |
- dev-tex/latex2html |
718 |
- virtual/tex-base |
719 |
- $(python_gen_any_dep ' |
720 |
- >=dev-python/beautifulsoup-4[${PYTHON_USEDEP}] |
721 |
- dev-python/lxml[${PYTHON_USEDEP}] |
722 |
- ') |
723 |
- media-libs/netpbm |
724 |
- ${PYTHON_DEPS} |
725 |
- )" |
726 |
- |
727 |
-REQUIRED_USE=" |
728 |
- cmkopt? ( !charmdebug !charmtracing ) |
729 |
- charmproduction? ( !charmdebug !charmtracing )" |
730 |
- |
731 |
-S="${WORKDIR}/${PN}" |
732 |
- |
733 |
-pkg_setup() { |
734 |
- use doc && python-any-r1_pkg_setup |
735 |
-} |
736 |
- |
737 |
-get_opts() { |
738 |
- local CHARM_OPTS |
739 |
- |
740 |
- # TCP instead of default UDP for socket comunication |
741 |
- # protocol |
742 |
- CHARM_OPTS+="$(usex tcp ' tcp' '')" |
743 |
- |
744 |
- # enable direct SMP support using shared memory |
745 |
- CHARM_OPTS+="$(usex smp ' smp' '')" |
746 |
- |
747 |
- CHARM_OPTS+="$(usex mlogft ' mlogft' '')" |
748 |
- CHARM_OPTS+="$(usex syncft ' syncft' '')" |
749 |
- |
750 |
- # Build shared libraries by default. |
751 |
- CHARM_OPTS+=" --build-shared" |
752 |
- |
753 |
- if use charmproduction; then |
754 |
- CHARM_OPTS+=" --with-production" |
755 |
- else |
756 |
- if use charmdebug; then |
757 |
- CHARM_OPTS+=" --enable-charmdebug" |
758 |
- fi |
759 |
- |
760 |
- if use charmtracing; then |
761 |
- CHARM_OPTS+=" --enable-tracing --enable-tracing-commthread" |
762 |
- fi |
763 |
- fi |
764 |
- |
765 |
- CHARM_OPTS+="$(usex numa ' --with-numa' '')" |
766 |
- echo $CHARM_OPTS |
767 |
-} |
768 |
- |
769 |
-src_prepare() { |
770 |
- sed \ |
771 |
- -e "/CMK_CF77/s:[fg]77:$(usex mpi "mpif90" "$(tc-getF77)"):g" \ |
772 |
- -e "/CMK_CF90/s:f95:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ |
773 |
- -e "/CMK_CF90/s:\`which f90.*$::g" \ |
774 |
- -e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \ |
775 |
- -e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \ |
776 |
- -e '/CMK_F90_MODINC/s:-p:-I:g' \ |
777 |
- -e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \ |
778 |
- -i src/arch/$(usex mpi "mpi" "net")*-linux*/*sh || die |
779 |
- sed \ |
780 |
- -e "/CMK_CF90/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ |
781 |
- -e "/F90DIR/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ |
782 |
- -e "/f95target/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ |
783 |
- -e "/f95version/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ |
784 |
- -i src/arch/common/*.sh || die |
785 |
- |
786 |
- sed \ |
787 |
- -e "s:-o conv-cpm:${LDFLAGS} &:g" \ |
788 |
- -e "s:-o charmxi:${LDFLAGS} &:g" \ |
789 |
- -e "s:-o charmrun-silent:${LDFLAGS} &:g" \ |
790 |
- -e "s:-o charmrun-notify:${LDFLAGS} &:g" \ |
791 |
- -e "s:-o charmrun:${LDFLAGS} &:g" \ |
792 |
- -e "s:-o charmd_faceless:${LDFLAGS} &:g" \ |
793 |
- -e "s:-o charmd:${LDFLAGS} &:g" \ |
794 |
- -i \ |
795 |
- src/scripts/Makefile \ |
796 |
- src/util/charmrun-src/Makefile || die |
797 |
- |
798 |
- # CMK optimization |
799 |
- use cmkopt && append-cppflags -DCMK_OPTIMIZE=1 |
800 |
- |
801 |
- # Fix QA notice. Filed report with upstream. |
802 |
- append-cflags -DALLOCA_H |
803 |
- |
804 |
- epatch "${FILESDIR}/charm-6.5.1-fix-navmenuGenerator.patch" |
805 |
- epatch "${FILESDIR}/charm-6.5.1-fix-markupSanitizer.patch" |
806 |
-} |
807 |
- |
808 |
-src_compile() { |
809 |
- local build_version="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '')" |
810 |
- local build_options="$(get_opts)" |
811 |
- #build only accepts -j from MAKEOPTS |
812 |
- local build_commandline="${build_version} ${build_options} -j$(makeopts_jobs)" |
813 |
- |
814 |
- # Build charmm++ first. |
815 |
- einfo "running ./build charm++ ${build_commandline}" |
816 |
- ./build charm++ ${build_commandline} || die "Failed to build charm++" |
817 |
- |
818 |
- if use ampi; then |
819 |
- einfo "running ./build AMPI ${build_commandline}" |
820 |
- ./build AMPI ${build_commandline} || die "Failed to build charm++" |
821 |
- fi |
822 |
- |
823 |
- # make pdf/html docs |
824 |
- if use doc; then |
825 |
- emake -j1 -C doc/charm++ |
826 |
- fi |
827 |
-} |
828 |
- |
829 |
-src_test() { |
830 |
- make -C tests/charm++ test TESTOPTS="++local" || die |
831 |
-} |
832 |
- |
833 |
-src_install() { |
834 |
- # Make charmc play well with gentoo before we move it into /usr/bin. This |
835 |
- # patch cannot be applied during src_prepare() because the charmc wrapper |
836 |
- # is used during building. |
837 |
- epatch "${FILESDIR}/charm-6.5.1-charmc-gentoo.patch" |
838 |
- |
839 |
- sed -e "s|gentoo-include|${P}|" \ |
840 |
- -e "s|gentoo-libdir|$(get_libdir)|g" \ |
841 |
- -e "s|VERSION|${P}/VERSION|" \ |
842 |
- -i ./src/scripts/charmc || die "failed patching charmc script" |
843 |
- |
844 |
- # In the following, some of the files are symlinks to ../tmp which we need |
845 |
- # to dereference first (see bug 432834). |
846 |
- |
847 |
- local i |
848 |
- |
849 |
- # Install binaries. |
850 |
- for i in bin/*; do |
851 |
- if [[ -L ${i} ]]; then |
852 |
- i=$(readlink -e "${i}") || die |
853 |
- fi |
854 |
- dobin "${i}" |
855 |
- done |
856 |
- |
857 |
- # Install headers. |
858 |
- insinto /usr/include/${P} |
859 |
- for i in include/*; do |
860 |
- if [[ -L ${i} ]]; then |
861 |
- i=$(readlink -e "${i}") || die |
862 |
- fi |
863 |
- doins "${i}" |
864 |
- done |
865 |
- |
866 |
- # Install libs incl. charm objects |
867 |
- for i in lib*/*.{so,o,a}; do |
868 |
- [[ ${i} = *.a ]] && use !static-libs && continue |
869 |
- if [[ -L ${i} ]]; then |
870 |
- i=$(readlink -e "${i}") || die |
871 |
- fi |
872 |
- [[ ${i} = *.so ]] && dolib.so "${i}" || dolib "${i}" |
873 |
- done |
874 |
- |
875 |
- # Basic docs. |
876 |
- dodoc CHANGES README |
877 |
- |
878 |
- # Install examples. |
879 |
- if use examples; then |
880 |
- find examples/ -name 'Makefile' | xargs sed \ |
881 |
- -r "s:(../)+bin/charmc:/usr/bin/charmc:" -i || \ |
882 |
- die "Failed to fix examples" |
883 |
- find examples/ -name 'Makefile' | xargs sed \ |
884 |
- -r "s:./charmrun:./charmrun ++local:" -i || \ |
885 |
- die "Failed to fix examples" |
886 |
- insinto /usr/share/doc/${PF}/examples |
887 |
- doins -r examples/charm++/* |
888 |
- docompress -x /usr/share/doc/${PF}/examples |
889 |
- fi |
890 |
- |
891 |
- # Install pdf/html docs |
892 |
- if use doc; then |
893 |
- cd "${S}/doc/charm++" |
894 |
- # Install pdfs. |
895 |
- insinto /usr/share/doc/${PF}/pdf |
896 |
- doins *.pdf |
897 |
- # Install html. |
898 |
- docinto html |
899 |
- dohtml -r manual/* |
900 |
- fi |
901 |
-} |
902 |
- |
903 |
-pkg_postinst() { |
904 |
- einfo "Please test your charm installation by copying the" |
905 |
- einfo "content of /usr/share/doc/${PF}/examples to a" |
906 |
- einfo "temporary location and run 'make test'." |
907 |
-} |
908 |
|
909 |
diff --git a/sys-cluster/charm/charm-6.7.1.ebuild b/sys-cluster/charm/charm-6.7.1.ebuild |
910 |
deleted file mode 100644 |
911 |
index 47af0637e8b..00000000000 |
912 |
--- a/sys-cluster/charm/charm-6.7.1.ebuild |
913 |
+++ /dev/null |
914 |
@@ -1,215 +0,0 @@ |
915 |
-# Copyright 1999-2017 Gentoo Foundation |
916 |
-# Distributed under the terms of the GNU General Public License v2 |
917 |
- |
918 |
-EAPI=5 |
919 |
- |
920 |
-FORTRAN_STANDARD="90" |
921 |
-PYTHON_COMPAT=( python2_7 ) |
922 |
- |
923 |
-inherit eutils flag-o-matic fortran-2 multilib multiprocessing python-any-r1 toolchain-funcs |
924 |
- |
925 |
-DESCRIPTION="Message-passing parallel language and runtime system" |
926 |
-HOMEPAGE="http://charm.cs.uiuc.edu/" |
927 |
-SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz" |
928 |
- |
929 |
-LICENSE="charm" |
930 |
-SLOT="0" |
931 |
-KEYWORDS="~amd64 ~x86" |
932 |
-IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mlogft mpi ampi numa smp static-libs syncft tcp" |
933 |
- |
934 |
-RDEPEND="mpi? ( virtual/mpi )" |
935 |
-DEPEND=" |
936 |
- ${RDEPEND} |
937 |
- doc? ( |
938 |
- >=app-text/poppler-0.12.3-r3[utils] |
939 |
- dev-tex/latex2html |
940 |
- virtual/tex-base |
941 |
- $(python_gen_any_dep ' |
942 |
- >=dev-python/beautifulsoup-4[${PYTHON_USEDEP}] |
943 |
- dev-python/lxml[${PYTHON_USEDEP}] |
944 |
- ') |
945 |
- media-libs/netpbm |
946 |
- ${PYTHON_DEPS} |
947 |
- ) |
948 |
- net-libs/libtirpc |
949 |
- " |
950 |
- |
951 |
-REQUIRED_USE=" |
952 |
- cmkopt? ( !charmdebug !charmtracing ) |
953 |
- charmproduction? ( !charmdebug !charmtracing )" |
954 |
- |
955 |
-pkg_setup() { |
956 |
- use doc && python-any-r1_pkg_setup |
957 |
-} |
958 |
- |
959 |
-get_opts() { |
960 |
- local CHARM_OPTS |
961 |
- |
962 |
- # TCP instead of default UDP for socket comunication |
963 |
- # protocol |
964 |
- CHARM_OPTS+="$(usex tcp ' tcp' '')" |
965 |
- |
966 |
- # enable direct SMP support using shared memory |
967 |
- CHARM_OPTS+="$(usex smp ' smp' '')" |
968 |
- |
969 |
- CHARM_OPTS+="$(usex mlogft ' mlogft' '')" |
970 |
- CHARM_OPTS+="$(usex syncft ' syncft' '')" |
971 |
- |
972 |
- # Build shared libraries by default. |
973 |
- CHARM_OPTS+=" --build-shared" |
974 |
- |
975 |
- if use charmproduction; then |
976 |
- CHARM_OPTS+=" --with-production" |
977 |
- else |
978 |
- if use charmdebug; then |
979 |
- CHARM_OPTS+=" --enable-charmdebug" |
980 |
- fi |
981 |
- |
982 |
- if use charmtracing; then |
983 |
- CHARM_OPTS+=" --enable-tracing --enable-tracing-commthread" |
984 |
- fi |
985 |
- fi |
986 |
- |
987 |
- CHARM_OPTS+="$(usex numa ' --with-numa' '')" |
988 |
- echo $CHARM_OPTS |
989 |
-} |
990 |
- |
991 |
-src_prepare() { |
992 |
- append-cppflags $($(tc-getPKG_CONFIG) --cflags libtirpc) |
993 |
- |
994 |
- sed \ |
995 |
- -e "/CMK_CF77/s:[fg]77:$(usex mpi "mpif90" "$(tc-getF77)") ${FCFLAGS}:g" \ |
996 |
- -e "/CMK_CF90/s:f95:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \ |
997 |
- -e "/CMK_CF90/s:\`which f90.*$::g" \ |
998 |
- -e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)") ${CPPFLAGS} ${CXXFLAGS}:g" \ |
999 |
- -e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)") ${CPPFLAGS} ${CFLAGS}:g" \ |
1000 |
- -e '/CMK_F90_MODINC/s:-p:-I:g' \ |
1001 |
- -e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \ |
1002 |
- -i src/arch/$(usex mpi "mpi" "net")*-linux*/*sh || die |
1003 |
- sed \ |
1004 |
- -e "/CMK_CF90/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \ |
1005 |
- -e "/F90DIR/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \ |
1006 |
- -e "/f95target/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \ |
1007 |
- -e "/f95version/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \ |
1008 |
- -i src/arch/common/*.sh || die |
1009 |
- |
1010 |
- sed \ |
1011 |
- -e "s:-o conv-cpm:${LDFLAGS} &:g" \ |
1012 |
- -e "s:-o charmxi:${LDFLAGS} &:g" \ |
1013 |
- -e "s:-o charmrun-silent:${LDFLAGS} &:g" \ |
1014 |
- -e "s:-o charmrun-notify:${LDFLAGS} &:g" \ |
1015 |
- -e "s:-o charmrun:${LDFLAGS} &:g" \ |
1016 |
- -e "s:-o charmd_faceless:${LDFLAGS} &:g" \ |
1017 |
- -e "s:-o charmd:${LDFLAGS} &:g" \ |
1018 |
- -e "/^CHARMC/s:$: ${CPPFLAGS} ${CFLAGS}:g" \ |
1019 |
- -i \ |
1020 |
- src/scripts/Makefile \ |
1021 |
- src/util/charmrun-src/Makefile || die |
1022 |
- |
1023 |
- # CMK optimization |
1024 |
- use cmkopt && append-cppflags -DCMK_OPTIMIZE=1 |
1025 |
- |
1026 |
- # Fix QA notice. Filed report with upstream. |
1027 |
- append-cflags -DALLOCA_H |
1028 |
-} |
1029 |
- |
1030 |
-src_compile() { |
1031 |
- local build_version="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '')" |
1032 |
- local build_options="$(get_opts)" |
1033 |
- #build only accepts -j from MAKEOPTS |
1034 |
- local build_commandline="${build_version} ${build_options} -j$(makeopts_jobs)" |
1035 |
- |
1036 |
- # Build charmm++ first. |
1037 |
- einfo "running ./build charm++ ${build_commandline}" |
1038 |
- ./build charm++ ${build_commandline} || die "Failed to build charm++" |
1039 |
- |
1040 |
- if use ampi; then |
1041 |
- einfo "running ./build AMPI ${build_commandline}" |
1042 |
- ./build AMPI ${build_commandline} || die "Failed to build charm++" |
1043 |
- fi |
1044 |
- |
1045 |
- # make pdf/html docs |
1046 |
- if use doc; then |
1047 |
- emake -j1 -C doc/charm++ |
1048 |
- fi |
1049 |
-} |
1050 |
- |
1051 |
-src_test() { |
1052 |
- make -C tests/charm++ test TESTOPTS="++local" || die |
1053 |
-} |
1054 |
- |
1055 |
-src_install() { |
1056 |
- # Make charmc play well with gentoo before we move it into /usr/bin. This |
1057 |
- # patch cannot be applied during src_prepare() because the charmc wrapper |
1058 |
- # is used during building. |
1059 |
- epatch "${FILESDIR}/charm-6.5.1-charmc-gentoo.patch" |
1060 |
- |
1061 |
- sed -e "s|gentoo-include|${P}|" \ |
1062 |
- -e "s|gentoo-libdir|$(get_libdir)|g" \ |
1063 |
- -e "s|VERSION|${P}/VERSION|" \ |
1064 |
- -i ./src/scripts/charmc || die "failed patching charmc script" |
1065 |
- |
1066 |
- # In the following, some of the files are symlinks to ../tmp which we need |
1067 |
- # to dereference first (see bug 432834). |
1068 |
- |
1069 |
- local i |
1070 |
- |
1071 |
- # Install binaries. |
1072 |
- for i in bin/*; do |
1073 |
- if [[ -L ${i} ]]; then |
1074 |
- i=$(readlink -e "${i}") || die |
1075 |
- fi |
1076 |
- dobin "${i}" |
1077 |
- done |
1078 |
- |
1079 |
- # Install headers. |
1080 |
- insinto /usr/include/${P} |
1081 |
- for i in include/*; do |
1082 |
- if [[ -L ${i} ]]; then |
1083 |
- i=$(readlink -e "${i}") || die |
1084 |
- fi |
1085 |
- doins "${i}" |
1086 |
- done |
1087 |
- |
1088 |
- # Install libs incl. charm objects |
1089 |
- for i in lib*/*.{so,a}; do |
1090 |
- [[ ${i} = *.a ]] && use !static-libs && continue |
1091 |
- if [[ -L ${i} ]]; then |
1092 |
- i=$(readlink -e "${i}") || die |
1093 |
- fi |
1094 |
- [[ ${i} = *.so ]] && dolib.so "${i}" || dolib "${i}" |
1095 |
- done |
1096 |
- |
1097 |
- # Basic docs. |
1098 |
- dodoc CHANGES README |
1099 |
- |
1100 |
- # Install examples. |
1101 |
- if use examples; then |
1102 |
- find examples/ -name 'Makefile' | xargs sed \ |
1103 |
- -r "s:(../)+bin/charmc:/usr/bin/charmc:" -i || \ |
1104 |
- die "Failed to fix examples" |
1105 |
- find examples/ -name 'Makefile' | xargs sed \ |
1106 |
- -r "s:./charmrun:./charmrun ++local:" -i || \ |
1107 |
- die "Failed to fix examples" |
1108 |
- insinto /usr/share/doc/${PF}/examples |
1109 |
- doins -r examples/charm++/* |
1110 |
- docompress -x /usr/share/doc/${PF}/examples |
1111 |
- fi |
1112 |
- |
1113 |
- # Install pdf/html docs |
1114 |
- if use doc; then |
1115 |
- cd "${S}/doc/charm++" |
1116 |
- # Install pdfs. |
1117 |
- insinto /usr/share/doc/${PF}/pdf |
1118 |
- doins *.pdf |
1119 |
- # Install html. |
1120 |
- docinto html |
1121 |
- dohtml -r manual/* |
1122 |
- fi |
1123 |
-} |
1124 |
- |
1125 |
-pkg_postinst() { |
1126 |
- einfo "Please test your charm installation by copying the" |
1127 |
- einfo "content of /usr/share/doc/${PF}/examples to a" |
1128 |
- einfo "temporary location and run 'make test'." |
1129 |
-} |
1130 |
|
1131 |
diff --git a/sys-cluster/charm/files/charm-6.5.1-CkReductionMgr.patch b/sys-cluster/charm/files/charm-6.5.1-CkReductionMgr.patch |
1132 |
deleted file mode 100644 |
1133 |
index ad07fc3aa3b..00000000000 |
1134 |
--- a/sys-cluster/charm/files/charm-6.5.1-CkReductionMgr.patch |
1135 |
+++ /dev/null |
1136 |
@@ -1,34 +0,0 @@ |
1137 |
-From 6b537784e9c345dee7f7cfd108c6abc779a969ae Mon Sep 17 00:00:00 2001 |
1138 |
-From: Nicolas Bock <nicolasbock@×××××.com> |
1139 |
-Date: Fri, 27 Sep 2013 10:50:45 -0600 |
1140 |
-Subject: [PATCH 2/4] Fixed bug in CkReductionMgr::reduceMessages(). |
1141 |
- |
1142 |
-The first contribution of a child node is a single message. In this case |
1143 |
-CkReductionMgr::reduceMessages() simply returns the message without calling |
1144 |
-the reducer. However, when using the CkReduction::set reducer this behavior is |
1145 |
-incorrect, and instead the reducer should be called even for one single |
1146 |
-message so that the message is wrapped into a setElement struct. In the |
1147 |
-current implementation, the reduction becomes corrupted because the |
1148 |
-CkReduction::set() method one tier up in the reduction sizes the remote |
1149 |
-contribution incorrectly assuming a setElement struct and not a simple |
1150 |
-message. |
1151 |
---- |
1152 |
- src/ck-core/ckreduction.C | 2 +- |
1153 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
1154 |
- |
1155 |
-diff --git a/src/ck-core/ckreduction.C b/src/ck-core/ckreduction.C |
1156 |
-index 07853a2..ef3e906 100644 |
1157 |
---- a/src/ck-core/ckreduction.C |
1158 |
-+++ b/src/ck-core/ckreduction.C |
1159 |
-@@ -850,7 +850,7 @@ CkReductionMsg *CkReductionMgr::reduceMessages(void) |
1160 |
- else |
1161 |
- {//Use the reducer to reduce the messages |
1162 |
- //if there is only one msg to be reduced just return that message |
1163 |
-- if(nMsgs == 1){ |
1164 |
-+ if(nMsgs == 1 && msgArr[0]->reducer != CkReduction::set) { |
1165 |
- ret = msgArr[0]; |
1166 |
- }else{ |
1167 |
- if (msgArr[0]->reducer == CkReduction::random) { |
1168 |
--- |
1169 |
-1.8.1.5 |
1170 |
- |
1171 |
|
1172 |
diff --git a/sys-cluster/charm/files/charm-6.5.1-cleanup-config.patch b/sys-cluster/charm/files/charm-6.5.1-cleanup-config.patch |
1173 |
deleted file mode 100644 |
1174 |
index ec71eb27d46..00000000000 |
1175 |
--- a/sys-cluster/charm/files/charm-6.5.1-cleanup-config.patch |
1176 |
+++ /dev/null |
1177 |
@@ -1,58 +0,0 @@ |
1178 |
-From b0af812652269a59457ad1bbf57165c0543bcd07 Mon Sep 17 00:00:00 2001 |
1179 |
-From: Nicolas Bock <nicolasbock@×××××.com> |
1180 |
-Date: Fri, 27 Sep 2013 10:49:52 -0600 |
1181 |
-Subject: [PATCH 1/4] Commented out colliding defines in conv-autoconfig.h |
1182 |
- |
1183 |
-The colliding defines (bug #252) are commented out in configure. |
1184 |
---- |
1185 |
- src/scripts/configure | 5 +++++ |
1186 |
- src/scripts/configure.in | 3 +++ |
1187 |
- 2 files changed, 8 insertions(+) |
1188 |
- |
1189 |
-diff --git a/src/scripts/configure b/src/scripts/configure |
1190 |
-index acd582c..faf268f 100755 |
1191 |
---- a/src/scripts/configure |
1192 |
-+++ b/src/scripts/configure |
1193 |
-@@ -1703,6 +1703,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu |
1194 |
- ac_config_headers="$ac_config_headers conv-autoconfig.h" |
1195 |
- |
1196 |
- |
1197 |
-+ac_config_commands="$ac_config_commands config-cleanup" |
1198 |
-+ |
1199 |
-+ |
1200 |
- CHARMINC="." |
1201 |
- test -r ./conv-config.sh && . ./conv-config.sh |
1202 |
- |
1203 |
-@@ -5259,6 +5262,7 @@ for ac_config_target in $ac_config_targets |
1204 |
- do |
1205 |
- case $ac_config_target in |
1206 |
- "conv-autoconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS conv-autoconfig.h" ;; |
1207 |
-+ "config-cleanup") CONFIG_COMMANDS="$CONFIG_COMMANDS config-cleanup" ;; |
1208 |
- "libs/ck-libs/ampi/ampiCC") CONFIG_FILES="$CONFIG_FILES libs/ck-libs/ampi/ampiCC" ;; |
1209 |
- "libs/ck-libs/ampi/ampirun") CONFIG_FILES="$CONFIG_FILES libs/ck-libs/ampi/ampirun" ;; |
1210 |
- "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; |
1211 |
-@@ -5812,6 +5816,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} |
1212 |
- |
1213 |
- |
1214 |
- case $ac_file$ac_mode in |
1215 |
-+ "config-cleanup":C) sed -i -e 's:^#define\s\+PACKAGE://&:' conv-autoconfig.h ;; |
1216 |
- "default":C) chmod +x libs/ck-libs/ampi/ampiCC libs/ck-libs/ampi/ampirun |
1217 |
- ;; |
1218 |
- |
1219 |
-diff --git a/src/scripts/configure.in b/src/scripts/configure.in |
1220 |
-index d1285ed..cad9a42 100644 |
1221 |
---- a/src/scripts/configure.in |
1222 |
-+++ b/src/scripts/configure.in |
1223 |
-@@ -3,6 +3,9 @@ AC_INIT(./Makefile) |
1224 |
- |
1225 |
- AC_CONFIG_HEADER(conv-autoconfig.h) |
1226 |
- |
1227 |
-+AC_CONFIG_COMMANDS([config-cleanup], |
1228 |
-+ [sed -i -e 's:^#define\s\+PACKAGE://&:' conv-autoconfig.h]) |
1229 |
-+ |
1230 |
- CHARMINC="." |
1231 |
- test -r ./conv-config.sh && . ./conv-config.sh |
1232 |
- |
1233 |
--- |
1234 |
-1.8.1.5 |
1235 |
- |
1236 |
|
1237 |
diff --git a/sys-cluster/charm/files/charm-6.5.1-fix-markupSanitizer.patch b/sys-cluster/charm/files/charm-6.5.1-fix-markupSanitizer.patch |
1238 |
deleted file mode 100644 |
1239 |
index 6ed4c1989b4..00000000000 |
1240 |
--- a/sys-cluster/charm/files/charm-6.5.1-fix-markupSanitizer.patch |
1241 |
+++ /dev/null |
1242 |
@@ -1,203 +0,0 @@ |
1243 |
-From 88f5739d3f0d34c51f318fc460b843253b4242e0 Mon Sep 17 00:00:00 2001 |
1244 |
-From: Nicolas Bock <nicolasbock@×××××.com> |
1245 |
-Date: Fri, 8 Nov 2013 09:58:55 -0700 |
1246 |
-Subject: [PATCH 2/2] Make markupSanitizer.py support python 3.1 and 3.2 |
1247 |
- |
1248 |
-The script only supports <python-3 because of how uni-code literals are |
1249 |
-treated in python-3.{1,2}. In python-2, a unicode string had to be prefixed |
1250 |
-with 'u', while this notation was dropped in python-3.{1,2}. I have added a |
1251 |
-check to the script so that it runs now with python-2.7 and python-3.{1,2,3}. |
1252 |
---- |
1253 |
- doc/markupSanitizer.py | 179 ++++++++++++++++++++++++++----------------------- |
1254 |
- 1 file changed, 95 insertions(+), 84 deletions(-) |
1255 |
- |
1256 |
-diff --git a/doc/markupSanitizer.py b/doc/markupSanitizer.py |
1257 |
-index f206cab..6fe247d 100755 |
1258 |
---- a/doc/markupSanitizer.py |
1259 |
-+++ b/doc/markupSanitizer.py |
1260 |
-@@ -4,87 +4,98 @@ from bs4 import BeautifulSoup |
1261 |
- import sys |
1262 |
- import os |
1263 |
- |
1264 |
--# Accept filename as user input |
1265 |
--argc = len( sys.argv ) |
1266 |
--if (argc < 2): raise Exception |
1267 |
--fileName = sys.argv[1]; |
1268 |
-- |
1269 |
--# Construct a DOM object |
1270 |
--soup = BeautifulSoup(open(fileName), "lxml") |
1271 |
-- |
1272 |
--# Assuming, tt tags are not spewed recklessly by latex2html, |
1273 |
--# replace them with code tags |
1274 |
--for t in soup('tt'): |
1275 |
-- t.wrap( soup.new_tag('code') ) |
1276 |
-- t.unwrap() |
1277 |
-- |
1278 |
--# Rewrap all div class=alltt blocks in pre tags |
1279 |
--for d in soup('div','alltt'): |
1280 |
-- d.wrap( soup.new_tag('pre') ) |
1281 |
-- d.unwrap() |
1282 |
-- |
1283 |
--# Remove br and span tags from within pre sections |
1284 |
--for p in soup('pre'): |
1285 |
-- for b in p('br'): |
1286 |
-- b.extract() |
1287 |
-- for s in p('span'): |
1288 |
-- s.unwrap() |
1289 |
-- |
1290 |
--# Remove all useless class 'arabic' spans |
1291 |
--for s in soup('span','arabic'): |
1292 |
-- s.unwrap() |
1293 |
-- |
1294 |
--# Extract the navigation bar |
1295 |
--navmenu = soup.find('div', 'navigation') |
1296 |
--if navmenu: |
1297 |
-- navmenu.extract() |
1298 |
-- |
1299 |
--# Wrap the remaining contents within a div |
1300 |
--if not soup.find('div', id='maincontainer'): |
1301 |
-- soup.body['id'] = 'maincontainer' |
1302 |
-- soup.body.name = 'div' |
1303 |
-- soup.find('div', id='maincontainer').wrap( soup.new_tag('body') ) |
1304 |
-- |
1305 |
--if navmenu: |
1306 |
-- # If this navmenu doesn't already have a TOC, insert one |
1307 |
-- if not navmenu.find('ul','manual-toc'): |
1308 |
-- # Add a toc within the navmenu |
1309 |
-- navmenuTOC = BeautifulSoup(open("tmp-navmenu.html"), "lxml") |
1310 |
-- navmenuTOC = navmenuTOC.find('ul','manual-toc').extract() |
1311 |
-- navmenuTOC.append( BeautifulSoup("".join([ |
1312 |
-- '<li><a href="http://charm.cs.illinois.edu">PPL Homepage</a></li>', |
1313 |
-- '<li><a href="http://charm.cs.illinois.edu/help">Other Manuals</a></li>']) |
1314 |
-- ) ) |
1315 |
-- navmenu.append(navmenuTOC) |
1316 |
-- |
1317 |
-- # Insert navigation symbols to prev and next links |
1318 |
-- prevsymbol = soup.new_tag('span') |
1319 |
-- prevsymbol['class'] = 'navsymbol' |
1320 |
-- prevsymbol.string = u'\xab' |
1321 |
-- prv = navmenu.find('li',id='nav-prev') |
1322 |
-- if prv: |
1323 |
-- prv.find('a').insert(0, prevsymbol) |
1324 |
-- |
1325 |
-- nextsymbol = soup.new_tag('span') |
1326 |
-- nextsymbol['class'] = 'navsymbol' |
1327 |
-- nextsymbol.string = u'\xbb' |
1328 |
-- nxt = navmenu.find('li',id='nav-next') |
1329 |
-- if nxt: |
1330 |
-- nxt.find('a').append(nextsymbol) |
1331 |
-- |
1332 |
-- # Reinsert the navigation bar at the end |
1333 |
-- soup.body.append(navmenu) |
1334 |
-- |
1335 |
--# Extract the title |
1336 |
--titl = soup.find('title') |
1337 |
-- |
1338 |
--# Replace the head section with the user-supplied head markup |
1339 |
--soup.find('head').extract() |
1340 |
--newhead = BeautifulSoup(open("../assets/head.html"), "lxml") |
1341 |
--newhead = newhead.find('head').extract() |
1342 |
--newhead.append(titl) |
1343 |
--soup.html.body.insert_before(newhead) |
1344 |
-- |
1345 |
--# Print cleaned up markup to stdout |
1346 |
--print( soup.prettify(formatter="html") ) |
1347 |
-- |
1348 |
-+def main (): |
1349 |
-+ # Accept filename as user input |
1350 |
-+ argc = len( sys.argv ) |
1351 |
-+ if (argc < 2): raise Exception |
1352 |
-+ fileName = sys.argv[1]; |
1353 |
-+ |
1354 |
-+ # Construct a DOM object |
1355 |
-+ soup = BeautifulSoup(open(fileName), "lxml") |
1356 |
-+ |
1357 |
-+ # Assuming, tt tags are not spewed recklessly by latex2html, |
1358 |
-+ # replace them with code tags |
1359 |
-+ for t in soup('tt'): |
1360 |
-+ t.wrap( soup.new_tag('code') ) |
1361 |
-+ t.unwrap() |
1362 |
-+ |
1363 |
-+ # Rewrap all div class=alltt blocks in pre tags |
1364 |
-+ for d in soup('div','alltt'): |
1365 |
-+ d.wrap( soup.new_tag('pre') ) |
1366 |
-+ d.unwrap() |
1367 |
-+ |
1368 |
-+ # Remove br and span tags from within pre sections |
1369 |
-+ for p in soup('pre'): |
1370 |
-+ for b in p('br'): |
1371 |
-+ b.extract() |
1372 |
-+ for s in p('span'): |
1373 |
-+ s.unwrap() |
1374 |
-+ |
1375 |
-+ # Remove all useless class 'arabic' spans |
1376 |
-+ for s in soup('span','arabic'): |
1377 |
-+ s.unwrap() |
1378 |
-+ |
1379 |
-+ # Extract the navigation bar |
1380 |
-+ navmenu = soup.find('div', 'navigation') |
1381 |
-+ if navmenu: |
1382 |
-+ navmenu.extract() |
1383 |
-+ |
1384 |
-+ # Wrap the remaining contents within a div |
1385 |
-+ if not soup.find('div', id='maincontainer'): |
1386 |
-+ soup.body['id'] = 'maincontainer' |
1387 |
-+ soup.body.name = 'div' |
1388 |
-+ soup.find('div', id='maincontainer').wrap( soup.new_tag('body') ) |
1389 |
-+ |
1390 |
-+ if navmenu: |
1391 |
-+ # If this navmenu doesn't already have a TOC, insert one |
1392 |
-+ if not navmenu.find('ul','manual-toc'): |
1393 |
-+ # Add a toc within the navmenu |
1394 |
-+ navmenuTOC = BeautifulSoup(open("tmp-navmenu.html"), "lxml") |
1395 |
-+ navmenuTOC = navmenuTOC.find('ul','manual-toc').extract() |
1396 |
-+ navmenuTOC.append( BeautifulSoup("".join([ |
1397 |
-+ '<li><a href="http://charm.cs.illinois.edu">PPL Homepage</a></li>', |
1398 |
-+ '<li><a href="http://charm.cs.illinois.edu/help">Other Manuals</a></li>']) |
1399 |
-+ ) ) |
1400 |
-+ navmenu.append(navmenuTOC) |
1401 |
-+ |
1402 |
-+ # Insert navigation symbols to prev and next links |
1403 |
-+ prevsymbol = soup.new_tag('span') |
1404 |
-+ prevsymbol['class'] = 'navsymbol' |
1405 |
-+ prevsymbol.string = u('\xab') |
1406 |
-+ prv = navmenu.find('li',id='nav-prev') |
1407 |
-+ if prv: |
1408 |
-+ prv.find('a').insert(0, prevsymbol) |
1409 |
-+ |
1410 |
-+ nextsymbol = soup.new_tag('span') |
1411 |
-+ nextsymbol['class'] = 'navsymbol' |
1412 |
-+ nextsymbol.string = u('\xbb') |
1413 |
-+ nxt = navmenu.find('li',id='nav-next') |
1414 |
-+ if nxt: |
1415 |
-+ nxt.find('a').append(nextsymbol) |
1416 |
-+ |
1417 |
-+ # Reinsert the navigation bar at the end |
1418 |
-+ soup.body.append(navmenu) |
1419 |
-+ |
1420 |
-+ # Extract the title |
1421 |
-+ titl = soup.find('title') |
1422 |
-+ |
1423 |
-+ # Replace the head section with the user-supplied head markup |
1424 |
-+ soup.find('head').extract() |
1425 |
-+ newhead = BeautifulSoup(open("../assets/head.html"), "lxml") |
1426 |
-+ newhead = newhead.find('head').extract() |
1427 |
-+ newhead.append(titl) |
1428 |
-+ soup.html.body.insert_before(newhead) |
1429 |
-+ |
1430 |
-+ # Print cleaned up markup to stdout |
1431 |
-+ print( soup.prettify(formatter="html") ) |
1432 |
-+ |
1433 |
-+if sys.version < '3': |
1434 |
-+ import codecs |
1435 |
-+ def u (x): |
1436 |
-+ return codecs.unicode_escape_decode(x)[0] |
1437 |
-+else: |
1438 |
-+ def u (x): |
1439 |
-+ return x |
1440 |
-+ |
1441 |
-+if __name__ == "__main__": |
1442 |
-+ main() |
1443 |
--- |
1444 |
-1.8.1.5 |
1445 |
- |
1446 |
|
1447 |
diff --git a/sys-cluster/charm/files/charm-6.5.1-fix-navmenuGenerator.patch b/sys-cluster/charm/files/charm-6.5.1-fix-navmenuGenerator.patch |
1448 |
deleted file mode 100644 |
1449 |
index a19a8dba1ff..00000000000 |
1450 |
--- a/sys-cluster/charm/files/charm-6.5.1-fix-navmenuGenerator.patch |
1451 |
+++ /dev/null |
1452 |
@@ -1,30 +0,0 @@ |
1453 |
-From 8b699f6c49df26b979da397b47c7dc7a099ed6b6 Mon Sep 17 00:00:00 2001 |
1454 |
-From: Nicolas Bock <nicolasbock@×××××.com> |
1455 |
-Date: Sat, 28 Sep 2013 07:47:36 -0600 |
1456 |
-Subject: [PATCH] Properly test for None return value in navmenuGenerator.py |
1457 |
- |
1458 |
---- |
1459 |
- doc/navmenuGenerator.py | 7 ++++++- |
1460 |
- 1 file changed, 6 insertions(+), 1 deletion(-) |
1461 |
- |
1462 |
-diff --git a/doc/navmenuGenerator.py b/doc/navmenuGenerator.py |
1463 |
-index c10afb5..5e5b97c 100755 |
1464 |
---- a/doc/navmenuGenerator.py |
1465 |
-+++ b/doc/navmenuGenerator.py |
1466 |
-@@ -13,7 +13,12 @@ fileName = sys.argv[1]; |
1467 |
- soup = BeautifulSoup(open(fileName), "lxml") |
1468 |
- |
1469 |
- # Get just the table of contents from the index page |
1470 |
--toc = soup.find("ul","ChildLinks").extract() |
1471 |
-+toc = soup.find("ul","ChildLinks") |
1472 |
-+ |
1473 |
-+if toc == None: |
1474 |
-+ sys.exit(0) |
1475 |
-+ |
1476 |
-+toc = toc.extract() |
1477 |
- |
1478 |
- # Retain only part and chapter titles |
1479 |
- for sctn in toc.select("li > ul > li > ul"): |
1480 |
--- |
1481 |
-1.8.1.5 |
1482 |
- |
1483 |
|
1484 |
diff --git a/sys-cluster/charm/files/charm-6.5.1-fix-string-parsing.patch b/sys-cluster/charm/files/charm-6.5.1-fix-string-parsing.patch |
1485 |
deleted file mode 100644 |
1486 |
index 1cc6b432c3d..00000000000 |
1487 |
--- a/sys-cluster/charm/files/charm-6.5.1-fix-string-parsing.patch |
1488 |
+++ /dev/null |
1489 |
@@ -1,50 +0,0 @@ |
1490 |
-From 14f407a5d183cdac7029cc54a9d8ae6b0cb5cbcd Mon Sep 17 00:00:00 2001 |
1491 |
-From: Nicolas Bock <nicolasbock@×××××.com> |
1492 |
-Date: Fri, 27 Sep 2013 10:52:18 -0600 |
1493 |
-Subject: [PATCH 3/4] charmrun.c: parsing of strings now parses "\n" into '\n' |
1494 |
- |
1495 |
-Since gdb lacks anything like ';' to separate several commands in one line, |
1496 |
-the commands need to be separated by a newline character. I have added some |
1497 |
-parsing logic so that the string "\n" will now be translated into the |
1498 |
-character '\n'. |
1499 |
---- |
1500 |
- src/arch/net/charmrun/charmrun.c | 23 +++++++++++++++++++++-- |
1501 |
- 1 file changed, 21 insertions(+), 2 deletions(-) |
1502 |
- |
1503 |
-diff --git a/src/arch/net/charmrun/charmrun.c b/src/arch/net/charmrun/charmrun.c |
1504 |
-index 6837712..8818cf8 100644 |
1505 |
---- a/src/arch/net/charmrun/charmrun.c |
1506 |
-+++ b/src/arch/net/charmrun/charmrun.c |
1507 |
-@@ -454,8 +454,27 @@ static int pparam_setdef(def, value) |
1508 |
- if (*p) return -1; |
1509 |
- return 0; |
1510 |
- case 's' : |
1511 |
-- *def->where.s = strdup(value); |
1512 |
-- return 0; |
1513 |
-+ { |
1514 |
-+ /* Parse input string and convert a literal "\n" into '\n'. */ |
1515 |
-+ *def->where.s = (char*) calloc(strlen(value)+1, sizeof(char)); |
1516 |
-+ char* parsed_value = (char*) *def->where.s; |
1517 |
-+ int i; |
1518 |
-+ int j = 0; |
1519 |
-+ for(i = 0; i < strlen(value); i++) |
1520 |
-+ { |
1521 |
-+ if(i+1 < strlen(value)) |
1522 |
-+ { |
1523 |
-+ if(value[i] == '\\' && value[i+1] == 'n') |
1524 |
-+ { |
1525 |
-+ parsed_value[j++] = '\n'; |
1526 |
-+ i++; |
1527 |
-+ continue; |
1528 |
-+ } |
1529 |
-+ } |
1530 |
-+ parsed_value[j++] = value[i]; |
1531 |
-+ } |
1532 |
-+ return 0; |
1533 |
-+ } |
1534 |
- case 'f' : |
1535 |
- *def->where.f = strtol(value, &p, 10); |
1536 |
- if (*p) return -1; |
1537 |
--- |
1538 |
-1.8.1.5 |
1539 |
- |
1540 |
|
1541 |
diff --git a/sys-cluster/charm/files/charm-6.5.1-static-library-fix.patch b/sys-cluster/charm/files/charm-6.5.1-static-library-fix.patch |
1542 |
deleted file mode 100644 |
1543 |
index 13efb2123b5..00000000000 |
1544 |
--- a/sys-cluster/charm/files/charm-6.5.1-static-library-fix.patch |
1545 |
+++ /dev/null |
1546 |
@@ -1,396 +0,0 @@ |
1547 |
-From 3a7261ab3a00472dd4bde0619c145c69aecf80c3 Mon Sep 17 00:00:00 2001 |
1548 |
-From: Nicolas Bock <nicolasbock@×××××.com> |
1549 |
-Date: Mon, 14 Oct 2013 07:15:14 -0600 |
1550 |
-Subject: [PATCH] Some libraries are only built statically, |
1551 |
- |
1552 |
-preventing a Charm++ installation with only dynamic libraries. |
1553 |
- |
1554 |
-On a typical Linux system only shared libraries are installed, because of the |
1555 |
-usual security and bloat arguments. However, if I build charm with |
1556 |
---build-shared, and then install only what is in lib_so, the charmc script |
1557 |
-breaks because some Converse libraries are built purely as .o and don't end up |
1558 |
-in lib_so. One example is seed based load balancing, e.g. libldb-rand.o. As |
1559 |
-far as I can tell, this is not too hard to fix. In the main makefile, the |
1560 |
-targets libldb-*.o are renamed to libldb-*.a, and the charmc script now tests |
1561 |
-both .a and .so when linking the seed based load balancing code. |
1562 |
---- |
1563 |
- src/scripts/Makefile | 136 +++++++++++++++++++++++++-------------------------- |
1564 |
- src/scripts/charmc | 37 ++++++++------ |
1565 |
- 2 files changed, 91 insertions(+), 82 deletions(-) |
1566 |
- |
1567 |
-diff --git a/src/scripts/Makefile b/src/scripts/Makefile |
1568 |
-index 51d0e7b..1550ed2 100644 |
1569 |
---- a/src/scripts/Makefile |
1570 |
-+++ b/src/scripts/Makefile |
1571 |
-@@ -349,7 +349,7 @@ dirs+sources: |
1572 |
- # Converse Libraries |
1573 |
- # |
1574 |
- ############################################################################### |
1575 |
--CLBLIBS=$(L)/libldb-rand.o $(L)/libldb-spray.o $(L)/libldb-workstealing.o $(L)/libldb-neighbor.o $(L)/libldb-none.o $(L)/libldb-test.o $(L)/libldb-bluegene.o |
1576 |
-+CLBLIBS=$(L)/libldb-rand.a $(L)/libldb-spray.a $(L)/libldb-workstealing.a $(L)/libldb-neighbor.a $(L)/libldb-none.a $(L)/libldb-test.a $(L)/libldb-bluegene.a |
1577 |
- |
1578 |
- TRACELIBS = $(L)/libtrace-converse.a $(L)/libtracef_f.a |
1579 |
- |
1580 |
-@@ -363,32 +363,32 @@ TRACELIBS += $(L)/libtrace-projections.a $(L)/libtrace-summary.a \ |
1581 |
- $(L)/libtrace-memory.a |
1582 |
- endif |
1583 |
- |
1584 |
--MEMLIBS=$(L)/libmemory-default.o $(L)/libmemory-os.o $(L)/libmemory-gnu.o \ |
1585 |
-- $(L)/libmemory-gnuold.o $(L)/libmemory-verbose.o \ |
1586 |
-- $(L)/libmemory-paranoid.o \ |
1587 |
-- $(L)/libmemory-leak.o $(L)/libmemory-isomalloc.o \ |
1588 |
-- $(L)/libmemory-os-verbose.o $(L)/libmemory-os-isomalloc.o \ |
1589 |
-- $(L)/libmemory-os-leak.o $(L)/libmemory-os-paranoid.o \ |
1590 |
-- $(L)/libmemory-os-lock.o $(L)/libmemory-os-wrapper.o |
1591 |
-+MEMLIBS=$(L)/libmemory-default.a $(L)/libmemory-os.a $(L)/libmemory-gnu.a \ |
1592 |
-+ $(L)/libmemory-gnuold.a $(L)/libmemory-verbose.a \ |
1593 |
-+ $(L)/libmemory-paranoid.a \ |
1594 |
-+ $(L)/libmemory-leak.a $(L)/libmemory-isomalloc.a \ |
1595 |
-+ $(L)/libmemory-os-verbose.a $(L)/libmemory-os-isomalloc.a \ |
1596 |
-+ $(L)/libmemory-os-leak.a $(L)/libmemory-os-paranoid.a \ |
1597 |
-+ $(L)/libmemory-os-lock.a $(L)/libmemory-os-wrapper.a |
1598 |
- |
1599 |
- BUILD_CHARMDEBUG=$(shell CHARMINC=.; if test -f ./conv-config.sh; then . ./conv-config.sh; echo $$CMK_CHARMDEBUG; fi ) |
1600 |
- |
1601 |
- ifneq "$(BUILD_CHARMDEBUG)" "0" |
1602 |
--MEMLIBS += $(L)/libmemory-charmdebug.o $(L)/libmemory-charmdebug-mmap.o \ |
1603 |
-- $(L)/libmemory-charmdebug-slot.o \ |
1604 |
-- $(L)/libmemory-charmdebug-mmap-slot.o \ |
1605 |
-- $(L)/libmemory-os-charmdebug.o $(L)/libmemory-hooks-charmdebug.o |
1606 |
-+MEMLIBS += $(L)/libmemory-charmdebug.a $(L)/libmemory-charmdebug-mmap.a \ |
1607 |
-+ $(L)/libmemory-charmdebug-slot.a \ |
1608 |
-+ $(L)/libmemory-charmdebug-mmap-slot.a \ |
1609 |
-+ $(L)/libmemory-os-charmdebug.a $(L)/libmemory-hooks-charmdebug.a |
1610 |
- endif |
1611 |
- |
1612 |
--THREADLIBS=$(L)/libthreads-default.o $(L)/libthreads-default-tls.o \ |
1613 |
-- $(L)/libthreads-qt.o $(L)/libthreads-qt-tls.o \ |
1614 |
-- $(L)/libthreads-context.o $(L)/libthreads-context-tls.o \ |
1615 |
-- $(L)/libthreads-uJcontext.o $(L)/libthreads-uJcontext-tls.o \ |
1616 |
-- $(L)/libthreads-pthreads.o $(L)/libthreads-fibers.o \ |
1617 |
-- $(L)/libthreads-stackcopy.o $(L)/libthreads-memoryalias.o \ |
1618 |
-- $(L)/libthreads-qt-memoryalias.o \ |
1619 |
-- $(L)/libthreads-context-memoryalias.o \ |
1620 |
-- $(L)/libthreads-uJcontext-memoryalias.o |
1621 |
-+THREADLIBS=$(L)/libthreads-default.a $(L)/libthreads-default-tls.a \ |
1622 |
-+ $(L)/libthreads-qt.a $(L)/libthreads-qt-tls.a \ |
1623 |
-+ $(L)/libthreads-context.a $(L)/libthreads-context-tls.a \ |
1624 |
-+ $(L)/libthreads-uJcontext.a $(L)/libthreads-uJcontext-tls.a \ |
1625 |
-+ $(L)/libthreads-pthreads.a $(L)/libthreads-fibers.a \ |
1626 |
-+ $(L)/libthreads-stackcopy.a $(L)/libthreads-memoryalias.a \ |
1627 |
-+ $(L)/libthreads-qt-memoryalias.a \ |
1628 |
-+ $(L)/libthreads-context-memoryalias.a \ |
1629 |
-+ $(L)/libthreads-uJcontext-memoryalias.a |
1630 |
- |
1631 |
- CVLIBS=$(L)/libconv-core.a \ |
1632 |
- $(L)/libconv-cplus-y.a $(L)/libconv-cplus-n.a \ |
1633 |
-@@ -543,19 +543,19 @@ lz4.o: lz4.c lz4.h |
1634 |
- $(CHARMC) -o $@ $< |
1635 |
- |
1636 |
- ## Converse load balancers (seed balancers, -balance) |
1637 |
--$(L)/libldb-none.o: cldb.none.c $(CVHEADERS) |
1638 |
-+$(L)/libldb-none.a: cldb.none.c $(CVHEADERS) |
1639 |
- $(CHARMC) -o $@ cldb.none.c |
1640 |
- |
1641 |
--$(L)/libldb-rand.o: cldb.rand.c cldb.h $(CVHEADERS) |
1642 |
-+$(L)/libldb-rand.a: cldb.rand.c cldb.h $(CVHEADERS) |
1643 |
- $(CHARMC) -o $@ cldb.rand.c |
1644 |
- |
1645 |
--$(L)/libldb-neighbor.o: cldb.neighbor.c cldb.neighbor.h graph.h $(CVHEADERS) |
1646 |
-+$(L)/libldb-neighbor.a: cldb.neighbor.c cldb.neighbor.h graph.h $(CVHEADERS) |
1647 |
- $(CHARMC) -o $@ cldb.neighbor.c |
1648 |
- |
1649 |
--$(L)/libldb-workstealing.o: cldb.workstealing.c cldb.workstealing.h graph.h $(CVHEADERS) |
1650 |
-+$(L)/libldb-workstealing.a: cldb.workstealing.c cldb.workstealing.h graph.h $(CVHEADERS) |
1651 |
- $(CHARMC) -o $@ cldb.workstealing.c |
1652 |
- |
1653 |
--$(L)/libldb-spray.o: cldb.spray.c $(CVHEADERS) |
1654 |
-+$(L)/libldb-spray.a: cldb.spray.c $(CVHEADERS) |
1655 |
- $(CHARMC) -o $@ cldb.spray.c |
1656 |
- |
1657 |
- |
1658 |
-@@ -565,138 +565,138 @@ $(L)/libldb-spray.o: cldb.spray.c $(CVHEADERS) |
1659 |
- #//$(L)/libldb-prioritycentralizedopt.o: cldb.prioritycentralizedopt.c cldb.prioritycentralizedopt.h $(CVHEADERS) |
1660 |
- #// $(CHARMC) -o $@ cldb.prioritycentralizedopt.c |
1661 |
- |
1662 |
--$(L)/libldb-test.o: cldb.test.c $(CVHEADERS) |
1663 |
-+$(L)/libldb-test.a: cldb.test.c $(CVHEADERS) |
1664 |
- $(CHARMC) -o $@ cldb.test.c |
1665 |
- |
1666 |
--$(L)/libldb-bluegene.o: cldb.bluegene.c $(CVHEADERS) |
1667 |
-+$(L)/libldb-bluegene.a: cldb.bluegene.c $(CVHEADERS) |
1668 |
- $(CHARMC) -o $@ cldb.bluegene.c |
1669 |
- |
1670 |
- ## Memory allocation libraries (-memory) |
1671 |
- MEM_DEPS=memory.c memory-gnu.c memory-gnuold.c converse.h conv-mach.h $(CVHEADERS) |
1672 |
--$(L)/libmemory-default.o: $(MEM_DEPS) |
1673 |
-+$(L)/libmemory-default.a: $(MEM_DEPS) |
1674 |
- $(CHARMC) -I. -o $@ -DCMK_MEMORY_BUILD_DEFAULT memory.c |
1675 |
- |
1676 |
--$(L)/libmemory-os.o: $(MEM_DEPS) |
1677 |
-+$(L)/libmemory-os.a: $(MEM_DEPS) |
1678 |
- $(CHARMC) -I. -o $@ -DCMK_MEMORY_BUILD_OS memory.c |
1679 |
- |
1680 |
--$(L)/libmemory-os-verbose.o: memory-verbose.c $(MEM_DEPS) |
1681 |
-+$(L)/libmemory-os-verbose.a: memory-verbose.c $(MEM_DEPS) |
1682 |
- -$(CHARMC) -I. -o $@ -DCMK_MEMORY_BUILD_OS_WRAPPED -DCMK_MEMORY_BUILD_VERBOSE memory.c || touch $@ |
1683 |
- |
1684 |
--$(L)/libmemory-os-paranoid.o: memory-paranoid.c $(MEM_DEPS) |
1685 |
-+$(L)/libmemory-os-paranoid.a: memory-paranoid.c $(MEM_DEPS) |
1686 |
- -$(CHARMC) -o $@ -DCMK_MEMORY_BUILD_OS_WRAPPED -DCMK_MEMORY_BUILD_PARANOID memory.c || touch $@ |
1687 |
- |
1688 |
--$(L)/libmemory-os-leak.o: $(MEM_DEPS) |
1689 |
-+$(L)/libmemory-os-leak.a: $(MEM_DEPS) |
1690 |
- -$(CHARMC) -I. -o $@ -DCMK_MEMORY_BUILD_OS_WRAPPED -DCMK_MEMORY_BUILD_LEAK memory.c || touch $@ |
1691 |
- |
1692 |
--$(L)/libmemory-os-isomalloc.o: memory-isomalloc.c $(MEM_DEPS) |
1693 |
-+$(L)/libmemory-os-isomalloc.a: memory-isomalloc.c $(MEM_DEPS) |
1694 |
- -$(CHARMC) -I. -o $@ -DCMK_MEMORY_BUILD_OS_WRAPPED -DCMK_MEMORY_BUILD_ISOMALLOC memory.c || touch $@ |
1695 |
- |
1696 |
--$(L)/libmemory-os-lock.o: memory-lock.c $(MEM_DEPS) |
1697 |
-+$(L)/libmemory-os-lock.a: memory-lock.c $(MEM_DEPS) |
1698 |
- -$(CHARMC) -I. -o $@ -DCMK_MEMORY_BUILD_OS_WRAPPED -DCMK_MEMORY_BUILD_LOCK memory.c || touch $@ |
1699 |
- |
1700 |
--$(L)/libmemory-os-charmdebug.o: memory-charmdebug.c $(MEM_DEPS) |
1701 |
-+$(L)/libmemory-os-charmdebug.a: memory-charmdebug.c $(MEM_DEPS) |
1702 |
- -$(CHARMC) -o $@ -DCMK_MEMORY_BUILD_OS_WRAPPED -DCMK_MEMORY_BUILD_CHARMDEBUG memory.c || touch $@ |
1703 |
- |
1704 |
--$(L)/libmemory-os-wrapper.o: memory-os-wrapper.C $(MEM_DEPS) |
1705 |
-+$(L)/libmemory-os-wrapper.a: memory-os-wrapper.C $(MEM_DEPS) |
1706 |
- -$(CHARMC) -o $@ memory-os-wrapper.C || touch $@ |
1707 |
- |
1708 |
--$(L)/libmemory-hooks-charmdebug.o: memory-charmdebug.c $(MEM_DEPS) |
1709 |
-+$(L)/libmemory-hooks-charmdebug.a: memory-charmdebug.c $(MEM_DEPS) |
1710 |
- -$(CHARMC) -o $@ -DCMK_MEMORY_BUILD_GNU_HOOKS -DCMK_MEMORY_BUILD_CHARMDEBUG memory.c || touch $@ |
1711 |
- |
1712 |
- # If the system doesn't have sbrk, these compilations may fail. |
1713 |
- # This is OK, but then we can't use "-memory gnu" or friends. |
1714 |
--$(L)/libmemory-gnu.o: $(MEM_DEPS) |
1715 |
-+$(L)/libmemory-gnu.a: $(MEM_DEPS) |
1716 |
- -$(CHARMC) -I. -o $@ -DCMK_MEMORY_BUILD_GNU memory.c || touch $@ |
1717 |
- |
1718 |
--$(L)/libmemory-gnuold.o: $(MEM_DEPS) |
1719 |
-+$(L)/libmemory-gnuold.a: $(MEM_DEPS) |
1720 |
- -$(CHARMC) -I. -o $@ -DCMK_MEMORY_BUILD_GNUOLD memory.c || touch $@ |
1721 |
- |
1722 |
--$(L)/libmemory-verbose.o: memory-verbose.c $(MEM_DEPS) |
1723 |
-+$(L)/libmemory-verbose.a: memory-verbose.c $(MEM_DEPS) |
1724 |
- -$(CHARMC) -I. -o $@ -DCMK_MEMORY_BUILD_VERBOSE memory.c || touch $@ |
1725 |
- |
1726 |
--$(L)/libmemory-paranoid.o: memory-paranoid.c $(MEM_DEPS) |
1727 |
-+$(L)/libmemory-paranoid.a: memory-paranoid.c $(MEM_DEPS) |
1728 |
- -$(CHARMC) -I. -o $@ -DCMK_MEMORY_BUILD_PARANOID memory.c || touch $@ |
1729 |
- |
1730 |
--$(L)/libmemory-leak.o: memory-leak.c $(MEM_DEPS) |
1731 |
-+$(L)/libmemory-leak.a: memory-leak.c $(MEM_DEPS) |
1732 |
- -$(CHARMC) -I. -o $@ -DCMK_MEMORY_BUILD_LEAK memory.c || touch $@ |
1733 |
- |
1734 |
--$(L)/libmemory-cache.o: memory-cache.c $(MEM_DEPS) |
1735 |
-+$(L)/libmemory-cache.a: memory-cache.c $(MEM_DEPS) |
1736 |
- -$(CHARMC) -I. -o $@ -DCMK_MEMORY_BUILD_CACHE memory.c || touch $@ |
1737 |
- |
1738 |
--$(L)/libmemory-isomalloc.o: memory-isomalloc.c $(MEM_DEPS) |
1739 |
-+$(L)/libmemory-isomalloc.a: memory-isomalloc.c $(MEM_DEPS) |
1740 |
- -$(CHARMC) -I. -o $@ -DCMK_MEMORY_BUILD_ISOMALLOC memory.c || touch $@ |
1741 |
- |
1742 |
--$(L)/libmemory-charmdebug.o: memory-charmdebug.c $(MEM_DEPS) |
1743 |
-+$(L)/libmemory-charmdebug.a: memory-charmdebug.c $(MEM_DEPS) |
1744 |
- -$(CHARMC) -I. -optimize -o $@ -DCMK_MEMORY_BUILD_CHARMDEBUG memory.c || touch $@ |
1745 |
- |
1746 |
--$(L)/libmemory-charmdebug-slot.o: memory-charmdebug.c $(MEM_DEPS) |
1747 |
-+$(L)/libmemory-charmdebug-slot.a: memory-charmdebug.c $(MEM_DEPS) |
1748 |
- -$(CHARMC) -I. -optimize -o $@ -DCMK_MEMORY_BUILD_CHARMDEBUG -DCMK_SEPARATE_SLOT memory.c || touch $@ |
1749 |
- |
1750 |
--$(L)/libmemory-charmdebug-mmap.o: memory-charmdebug.c $(MEM_DEPS) |
1751 |
-+$(L)/libmemory-charmdebug-mmap.a: memory-charmdebug.c $(MEM_DEPS) |
1752 |
- -$(CHARMC) -I. -optimize -o $@ -DCMK_MEMORY_BUILD_CHARMDEBUG -DCPD_USE_MMAP memory.c || touch $@ |
1753 |
- |
1754 |
--$(L)/libmemory-charmdebug-mmap-slot.o: memory-charmdebug.c $(MEM_DEPS) |
1755 |
-+$(L)/libmemory-charmdebug-mmap-slot.a: memory-charmdebug.c $(MEM_DEPS) |
1756 |
- -$(CHARMC) -I. -optimize -o $@ -DCMK_MEMORY_BUILD_CHARMDEBUG -DCPD_USE_MMAP -DCMK_SEPARATE_SLOT memory.c || touch $@ |
1757 |
- |
1758 |
- ## Thread libraries (-thread) |
1759 |
- |
1760 |
- LIBTHREADSDEPS = threads.c $(CVHEADERS) QUICK_THREADS |
1761 |
- |
1762 |
--$(L)/libthreads-default.o: $(LIBTHREADSDEPS) |
1763 |
-+$(L)/libthreads-default.a: $(LIBTHREADSDEPS) |
1764 |
- $(CHARMC) -o $@ -DCMK_THREADS_BUILD_DEFAULT=1 -IQuickThreads -I. threads.c |
1765 |
- |
1766 |
--$(L)/libthreads-default-tls.o: $(LIBTHREADSDEPS) |
1767 |
-+$(L)/libthreads-default-tls.a: $(LIBTHREADSDEPS) |
1768 |
- -$(CHARMC) -o $@ -DCMK_THREADS_BUILD_DEFAULT=1 -DCMK_THREADS_BUILD_TLS=1 -IQuickThreads -I. threads.c 2> /dev/null || touch $@ |
1769 |
- |
1770 |
--$(L)/libthreads-qt.o: $(LIBTHREADSDEPS) |
1771 |
-+$(L)/libthreads-qt.a: $(LIBTHREADSDEPS) |
1772 |
- $(CHARMC) -o $@ -DCMK_THREADS_BUILD_QT=1 -IQuickThreads threads.c |
1773 |
- |
1774 |
--$(L)/libthreads-qt-tls.o: $(LIBTHREADSDEPS) |
1775 |
-+$(L)/libthreads-qt-tls.a: $(LIBTHREADSDEPS) |
1776 |
- -$(CHARMC) -o $@ -DCMK_THREADS_BUILD_QT=1 -DCMK_THREADS_BUILD_TLS=1 -IQuickThreads threads.c 2> /dev/null || touch $@ |
1777 |
- |
1778 |
--$(L)/libthreads-context.o: $(LIBTHREADSDEPS) |
1779 |
-+$(L)/libthreads-context.a: $(LIBTHREADSDEPS) |
1780 |
- -$(CHARMC) -o $@ -DCMK_THREADS_BUILD_CONTEXT=1 -IQuickThreads threads.c || touch $@ |
1781 |
- |
1782 |
--$(L)/libthreads-context-tls.o: $(LIBTHREADSDEPS) |
1783 |
-+$(L)/libthreads-context-tls.a: $(LIBTHREADSDEPS) |
1784 |
- -$(CHARMC) -o $@ -DCMK_THREADS_BUILD_CONTEXT=1 -DCMK_THREADS_BUILD_TLS=1 -IQuickThreads threads.c 2> /dev/null || touch $@ |
1785 |
- |
1786 |
--$(L)/libthreads-uJcontext.o: $(LIBTHREADSDEPS) uJcontext.c |
1787 |
-+$(L)/libthreads-uJcontext.a: $(LIBTHREADSDEPS) uJcontext.c |
1788 |
- -$(CHARMC) -o $@ -DCMK_THREADS_BUILD_JCONTEXT=1 -IQuickThreads -I. threads.c || touch $@ |
1789 |
- |
1790 |
--$(L)/libthreads-uJcontext-tls.o: $(LIBTHREADSDEPS) uJcontext.c |
1791 |
-+$(L)/libthreads-uJcontext-tls.a: $(LIBTHREADSDEPS) uJcontext.c |
1792 |
- -$(CHARMC) -o $@ -DCMK_THREADS_BUILD_JCONTEXT=1 -DCMK_THREADS_BUILD_TLS=1 -IQuickThreads -I. threads.c || touch $@ |
1793 |
- |
1794 |
--$(L)/libthreads-pthreads.o: $(LIBTHREADSDEPS) |
1795 |
-+$(L)/libthreads-pthreads.a: $(LIBTHREADSDEPS) |
1796 |
- -$(CHARMC) -o $@ -DCMK_THREADS_BUILD_PTHREADS=1 -IQuickThreads threads.c || touch $@ |
1797 |
- |
1798 |
--$(L)/libthreads-fibers.o: $(LIBTHREADSDEPS) |
1799 |
-+$(L)/libthreads-fibers.a: $(LIBTHREADSDEPS) |
1800 |
- -$(CHARMC) -o $@ -DCMK_THREADS_BUILD_FIBERS=1 -IQuickThreads threads.c 2> /dev/null || touch $@ |
1801 |
- |
1802 |
--$(L)/libthreads-stackcopy.o: $(LIBTHREADSDEPS) |
1803 |
-+$(L)/libthreads-stackcopy.a: $(LIBTHREADSDEPS) |
1804 |
- -$(CHARMC) -o $@ -DCMK_THREADS_BUILD_STACKCOPY=1 -IQuickThreads threads.c || touch $@ |
1805 |
- |
1806 |
--$(L)/libthreads-memoryalias.o: $(LIBTHREADSDEPS) |
1807 |
-+$(L)/libthreads-memoryalias.a: $(LIBTHREADSDEPS) |
1808 |
- -$(CHARMC) -o $@ -DCMK_THREADS_ALIAS_STACK=1 -DCMK_THREADS_BUILD_DEFAULT=1 -IQuickThreads threads.c || touch $@ |
1809 |
- |
1810 |
--$(L)/libthreads-qt-memoryalias.o: $(LIBTHREADSDEPS) |
1811 |
-+$(L)/libthreads-qt-memoryalias.a: $(LIBTHREADSDEPS) |
1812 |
- -$(CHARMC) -o $@ -DCMK_THREADS_ALIAS_STACK=1 -DCMK_THREADS_BUILD_QT=1 -IQuickThreads threads.c || touch $@ |
1813 |
- |
1814 |
--$(L)/libthreads-context-memoryalias.o: $(LIBTHREADSDEPS) |
1815 |
-+$(L)/libthreads-context-memoryalias.a: $(LIBTHREADSDEPS) |
1816 |
- -$(CHARMC) -o $@ -DCMK_THREADS_ALIAS_STACK=1 -DCMK_THREADS_BUILD_CONTEXT=1 -IQuickThreads threads.c || touch $@ |
1817 |
- |
1818 |
--$(L)/libthreads-uJcontext-memoryalias.o: $(LIBTHREADSDEPS) |
1819 |
-+$(L)/libthreads-uJcontext-memoryalias.a: $(LIBTHREADSDEPS) |
1820 |
- -$(CHARMC) -o $@ -DCMK_THREADS_ALIAS_STACK=1 -DCMK_THREADS_BUILD_JCONTEXT=1 -IQuickThreads -I. threads.c || touch $@ |
1821 |
- |
1822 |
- ## Global swapping (-swapglobal) |
1823 |
--swapglobal-target: $(L)/libglobal-swap.o $(L)/libglobal-copy.o $(L)/loadsym.o |
1824 |
-+swapglobal-target: $(L)/libglobal-swap.a $(L)/libglobal-copy.a $(L)/loadsym.a |
1825 |
- |
1826 |
--$(L)/libglobal-swap.o: global-elfgot.C $(CVHEADERS) |
1827 |
-+$(L)/libglobal-swap.a: global-elfgot.C $(CVHEADERS) |
1828 |
- -$(CHARMC) -c global-elfgot.C -o $@ || touch $@ |
1829 |
- |
1830 |
--$(L)/libglobal-copy.o: global-elfcopy.C $(CVHEADERS) |
1831 |
-+$(L)/libglobal-copy.a: global-elfcopy.C $(CVHEADERS) |
1832 |
- -$(CHARMC) -c global-elfcopy.C -o $@ || touch $@ |
1833 |
- |
1834 |
--$(L)/loadsym.o: loadsym.c $(CVHEADERS) |
1835 |
-+$(L)/loadsym.a: loadsym.c $(CVHEADERS) |
1836 |
- -$(CHARMC) -c loadsym.c -o $@ || touch $@ |
1837 |
- |
1838 |
- ############################################################################### |
1839 |
-diff --git a/src/scripts/charmc b/src/scripts/charmc |
1840 |
-index 4d37a6b..ee4e76c 100755 |
1841 |
---- a/src/scripts/charmc |
1842 |
-+++ b/src/scripts/charmc |
1843 |
-@@ -340,6 +340,14 @@ printVersion() |
1844 |
- echo Charm++ Version $version |
1845 |
- } |
1846 |
- |
1847 |
-+getLibraryObject() |
1848 |
-+{ |
1849 |
-+ if [[ -f "${CHARMLIB}/$1-$2.a" ]]; then |
1850 |
-+ echo "${CHARMLIB}/$1-$2.a" |
1851 |
-+ else |
1852 |
-+ echo "${CHARMLIBSO}/$1-$2.so" |
1853 |
-+ fi |
1854 |
-+} |
1855 |
- |
1856 |
- ############################################################################## |
1857 |
- # |
1858 |
-@@ -1616,13 +1624,12 @@ then |
1859 |
- fi |
1860 |
- |
1861 |
- BAL_EXT=`getExtention $BALANCE` |
1862 |
--if [ -z "$BAL_EXT" ] |
1863 |
--then |
1864 |
--# Balance has no extention-- is a library reference |
1865 |
-- BAL_OBJ="$CHARMLIB/libldb-$BALANCE.o" |
1866 |
-+if [[ -z "$BAL_EXT" ]]; then |
1867 |
-+ # Balance has no extension-- is a library reference |
1868 |
-+ BAL_OBJ=$(getLibraryObject "libldb" ${BALANCE}) |
1869 |
- else |
1870 |
--# Balance has some extention-- must be a .o or .a file |
1871 |
-- BAL_OBJ="$BALANCE" |
1872 |
-+ # Balance has some extension-- must be a .o or .a file |
1873 |
-+ BAL_OBJ="$BALANCE" |
1874 |
- fi |
1875 |
- |
1876 |
- Debug "Finished with BAL_OBJ=$BAL_OBJ, TRACEMODE=$TRACEMODE..." |
1877 |
-@@ -1638,10 +1645,11 @@ then |
1878 |
- fi |
1879 |
- fi |
1880 |
- |
1881 |
-+Debug "Finished with BAL_OBJ=$BAL_OBJ, TRACEMODE=$TRACEMODE..." |
1882 |
- |
1883 |
- # Check for valid choice of MEMORY |
1884 |
- |
1885 |
--MEM_OBJ="$CHARMLIB/libmemory-$MEMORY.o" |
1886 |
-+MEM_OBJ=$(getLibraryObject "libmemory" ${MEMORY}) |
1887 |
- |
1888 |
- if [ ! -r $MEM_OBJ -o ! -s $MEM_OBJ ] |
1889 |
- then |
1890 |
-@@ -1652,7 +1660,7 @@ fi |
1891 |
- # For memory wrapping around the OS allocator, need to add also the wrapper object |
1892 |
- case $MEMORY in |
1893 |
- os-*) |
1894 |
-- MEM_OBJ=$MEM_OBJ" $CHARMLIB/libmemory-os-wrapper.o" |
1895 |
-+ MEM_OBJ="${MEM_OBJ} $(getLibraryObject 'libmemory' 'os-wrapper')" |
1896 |
- ;; |
1897 |
- esac |
1898 |
- |
1899 |
-@@ -1670,7 +1678,8 @@ then |
1900 |
- THREAD=${THREAD}-tls |
1901 |
- fi |
1902 |
- fi |
1903 |
--THREAD_OBJ="$CHARMLIB/libthreads-$THREAD.o" |
1904 |
-+ |
1905 |
-+THREAD_OBJ=$(getLibraryObject "libthreads" ${THREAD}) |
1906 |
- |
1907 |
- if [ ! -r $THREAD_OBJ -o ! -s $THREAD_OBJ ] |
1908 |
- then |
1909 |
-@@ -1836,7 +1845,7 @@ esac |
1910 |
- |
1911 |
- if [ "$BUILD_SHARE" = "0" ] |
1912 |
- then |
1913 |
-- MIDDLE_LIBS="$MEM_OBJ $THREAD_OBJ $MIDDLE_LIBS" |
1914 |
-+ MIDDLE_LIBS="$MIDDLE_LIBS $MEM_OBJ $THREAD_OBJ" |
1915 |
- fi |
1916 |
- |
1917 |
- if [ "$CHARM_SHARED" = "1" ] |
1918 |
-@@ -1848,17 +1857,17 @@ then |
1919 |
- then |
1920 |
- LANG_LIBS="-L$CHARMLIBSO $OBJECTFILES $PRE_LIBRARIES" |
1921 |
- else |
1922 |
-- LANG_LIBS="-L$CHARMLIBSO $BAL_OBJ $OBJECTFILES $modInitObj $PRE_LIBRARIES" |
1923 |
-+ LANG_LIBS="-L$CHARMLIBSO $OBJECTFILES $modInitObj $PRE_LIBRARIES" |
1924 |
- fi |
1925 |
- else |
1926 |
-- LANG_LIBS="-L$CHARMLIB -I$CHARMINC $BAL_OBJ $OBJECTFILES $modInitObj $PRE_LIBRARIES" |
1927 |
-+ LANG_LIBS="-L$CHARMLIB -I$CHARMINC $OBJECTFILES $modInitObj $PRE_LIBRARIES" |
1928 |
- fi |
1929 |
- if [ "$TRACE_WITH_TAU" = 1 ] |
1930 |
- then |
1931 |
- echo "Linking with the TAU libraries: $TAU_LIBS" |
1932 |
-- ALL_LIBS="$LANG_LIBS $MIDDLE_LIBS $CMK_LIBS $POST_LIBRARIES $CMK_SYSLIBS $TAU_LIBS" |
1933 |
-+ ALL_LIBS="$LANG_LIBS $MIDDLE_LIBS $BAL_OBJ $CMK_LIBS $POST_LIBRARIES $CMK_SYSLIBS $TAU_LIBS" |
1934 |
- else |
1935 |
-- ALL_LIBS="$LANG_LIBS $MIDDLE_LIBS $CMK_LIBS $POST_LIBRARIES $CMK_SYSLIBS" |
1936 |
-+ ALL_LIBS="$LANG_LIBS $MIDDLE_LIBS $BAL_OBJ $CMK_LIBS $POST_LIBRARIES $CMK_SYSLIBS" |
1937 |
- fi |
1938 |
- Debugf "All libraries are: $ALL_LIBS" |
1939 |
- |
1940 |
--- |
1941 |
-1.8.1.5 |
1942 |
- |