diff options
| author |   Sébastien Fabbro <sebfabbro@gmail.com> | 2012-01-14 05:29:33 +0000 |
|---|---|---|
| committer | Sébastien Fabbro <sebfabbro@gmail.com> | 2012-01-14 05:29:33 +0000 |
| commit | c0ff3c6c91cbfed4417aac81e01e5dd814e1d83d (patch) | |
| tree | 97ec443d1c5c529a22b681130d71ce30f5e33fc1 /sys-cluster/mpich2 | |
| parent | tweaks to mpich2 (diff) | |
| parent | mpich2: add link to upstream report (diff) | |
| download | sci-c0ff3c6c91cbfed4417aac81e01e5dd814e1d83d.tar.gz sci-c0ff3c6c91cbfed4417aac81e01e5dd814e1d83d.tar.bz2 sci-c0ff3c6c91cbfed4417aac81e01e5dd814e1d83d.zip | |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci
Conflicts:
sys-cluster/mpich2/Manifest
Diffstat (limited to 'sys-cluster/mpich2')
| -rw-r--r-- | sys-cluster/mpich2/Manifest | 16 | ||||
| -rw-r--r-- | sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest index 5f5402260..ef417e0ec 100644 --- a/sys-cluster/mpich2/Manifest +++ b/sys-cluster/mpich2/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 0001-MPD_CONF_FILE-should-be-readable.patch 1496 RMD160 33b8db14ab69293a53ecb0192ea7a2a568ee422e SHA1 88cb1d7cc60a1eb7a2a7ea07c8058ebb3318c734 SHA256 747462d1d2272291fd956631cee4170112523027e2b89d4f2abf6d618cc004aa AUX 0002-mpd_conf_file-search-order.patch 3882 RMD160 90bf46695398bea605002826c7d9b85c7f07e5e9 SHA1 9f20b59f853e13d81f6227ddb16535d76ec4bab3 SHA256 a56c943e68e0bcf69900ae76cb4df73ef19d60f0e9e16e6d75d48b2651324b33 AUX 0003-Fix-pkgconfig-for-mpich2-ch3-v1.2.1.patch 1510 RMD160 8bcd0ec310bcbc13bfd3d0200c1b9f5a88fc4677 SHA1 949da42c2fa90c4a298dc37e0994e97317ae75e9 SHA256 84896b8c127a872fac3a99e9acdb41a2a051275399b186b54349a72d478acb00 @@ -14,6 +17,19 @@ AUX mpich2-hvector.patch 2011 RMD160 1abb8e8872fd7eb4e0c22ca5c499e8dce475a8c0 SH DIST mpich2-1.2.1p1.tar.gz 18014859 RMD160 810cc486b65e4bcf977ac8d96ccbbcea87e0cbaa SHA1 26bd5620b45bc654aa3945755d11450be63d650c SHA256 a55d1682ee0b5ebbacc047f60620ed291e0a9b3ded3eaeb6a2c81a1598c4c964 DIST mpich2-1.4.1p1.tar.gz 19502854 RMD160 1d355cc07b8675af77b1c255fd10696844447298 SHA1 8dcc8888fb27232eb8f76c11cc890f1c3c483804 SHA256 a20f798ceaad6b0161ddecac98623b65d6a4033072f39ced13b9043916e3d1ee EBUILD mpich2-1.2.1_p1-r2.ebuild 5030 RMD160 b947f8a8fa374d4e49a407d212a61fdd20986e61 SHA1 264fa061d136685befd2637272510b2298f05ccb SHA256 48abd33f82ce7728c4fe2010c58fce7718e0e50ff0242f4d44d4781532a51a43 +<<<<<<< HEAD EBUILD mpich2-1.4.1_p1.ebuild 4714 RMD160 a49b7faa577677ee339e61d289aa44018d5a4418 SHA1 36684e8346a54050e2150cadc03d051d414daca8 SHA256 e091de691c7c7fddb619cc6bc44c759866b2302998424fd6e9621fb7d7bb1848 MISC ChangeLog 5728 RMD160 c305f9e20d011642a1f21f24faf80aad982121d3 SHA1 b535528c38702ff0c4f7d4788afac2732b4ac95b SHA256 221798a06f715aa9c2503093cc46d794cdbc37f9256e9a304e7d1a9f6e538ac2 MISC metadata.xml 534 RMD160 8d4fa7f5f4860a520e58b3866b2a2fdc04ab6d83 SHA1 60bc1b41a847e2f9fbf527b204fcafc054d04d33 SHA256 763dc9199c817bb987335dcdddcc65de5f419410aac2f027fc9a2208e91f5c0a +======= +EBUILD mpich2-1.4.1_p1.ebuild 4779 RMD160 08f5cffd53be5fb3b34758421f408e4196c7a15d SHA1 510cf9c9a48bea54bb4573ac477aecd9ca4f8362 SHA256 c02772bf6fa2e1394691647c3f7d3297c6f451764d54fc994a15de99485531af +MISC ChangeLog 5601 RMD160 d8a414adb8883087a573543384ee25bb31695058 SHA1 cd7ed83163270871c38c17f315b1b0a45571a86e SHA256 85661b314d33580146a6d46118cc0b7dab1d364674c01a4c631ce801c82fc87e +MISC metadata.xml 534 RMD160 8d4fa7f5f4860a520e58b3866b2a2fdc04ab6d83 SHA1 60bc1b41a847e2f9fbf527b204fcafc054d04d33 SHA256 763dc9199c817bb987335dcdddcc65de5f419410aac2f027fc9a2208e91f5c0a +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk8NyWQACgkQ4MrvBE1wQ8l53gCeK19kDUNZSiJUfAi4Vdybx5iv +wx0An2hpRar8mlP5JwNbA6MFRREgrhKM +=3nzZ +-----END PGP SIGNATURE----- +>>>>>>> a19ee9358dcfb3269bb741cb6e45e533e1ee5d3f diff --git a/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild b/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild index 6853722be..663d685b7 100644 --- a/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild +++ b/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild @@ -140,6 +140,7 @@ src_test() { sed -i '/^[# ]*non_zero_root/d' test/mpi/perf/testlist || die # Failing tests based on requiring MPI_THREAD_MULTIPLE. + # http://lists.mcs.anl.gov/pipermail/mpich-discuss/2012-January/011618.html sed -i \ -e '/^[# ]*pt2pt/d' \ -e '/^[# ]*comm/d' \ |