diff options
| -rw-r--r-- | sys-cluster/mpe2/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-cluster/mpe2/Manifest | 12 | ||||
| -rw-r--r-- | sys-cluster/mpe2/mpe2-1.0.6_p1-r1.ebuild | 10 | ||||
| -rw-r--r-- | sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild | 13 |
4 files changed, 28 insertions, 14 deletions
diff --git a/sys-cluster/mpe2/ChangeLog b/sys-cluster/mpe2/ChangeLog index 00c2fd6db16f..1477c50ed580 100644 --- a/sys-cluster/mpe2/ChangeLog +++ b/sys-cluster/mpe2/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-cluster/mpe2 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpe2/ChangeLog,v 1.4 2010/09/13 18:38:12 jsbronder Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpe2/ChangeLog,v 1.5 2010/09/13 22:20:52 jsbronder Exp $ + + 13 Sep 2010; Justin Bronder <jsbronder@gentoo.org> mpe2-1.0.6_p1.ebuild, + mpe2-1.0.6_p1-r1.ebuild: + Disable parallel make per upstream, + http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1 *mpe2-1.0.6_p1-r1 (13 Sep 2010) diff --git a/sys-cluster/mpe2/Manifest b/sys-cluster/mpe2/Manifest index 9db27b547aea..4f615c8e5c50 100644 --- a/sys-cluster/mpe2/Manifest +++ b/sys-cluster/mpe2/Manifest @@ -4,14 +4,14 @@ Hash: SHA1 AUX slog2sdk-trace_rlog-makefile-fixes.patch 2734 RMD160 43e2aa5c7b83fce702e27d21c87dbbfbb00c7f4f SHA1 1077071d79b20bfec3a4ba7ab0be3724d2aa5ab8 SHA256 015ac2a9bed7d84a9e101c437b54c689e79f293c318e022a1d6884ed3571545e AUX slog2sdk-trace_sample-makefile-fixes.patch 2746 RMD160 a64dd4d6f574297b533d6631762ab9b022a74c26 SHA1 d370094c222b983d336c40302d4075735c268461 SHA256 e611b08f6c7a2cdccee7d37075ff1f8ab4bce84458b40bc859c87f541d54fd2a DIST mpe2-1.0.6p1.tar.gz 9313216 RMD160 1c52f379c3fff4bac5c68505ca657584d8092f7f SHA1 bc810c7a1f3ef5b9cf2563278053afadbc2029f2 SHA256 23cfef2b8a0a27408b5bdadeb216ba3adb3b02bf40d0fa6fc0a110cefd8c5863 -EBUILD mpe2-1.0.6_p1-r1.ebuild 3622 RMD160 0c09875390c2f1f0044530904054fc70bf6aeb47 SHA1 153d5ca80197efe523bd07a6e0eddcd1797fef92 SHA256 266c1e39303f0664adb5a4269e7ece531368aad58d20a6cc70e59410d4810363 -EBUILD mpe2-1.0.6_p1.ebuild 3486 RMD160 9354fe32993d323fa0a2e4173492c71d90cb1a91 SHA1 b00b5d22ab211cdc02b2675d96433d31af15119c SHA256 b73cf86d246e6e609f051048f4234d2195a8b7791958271d9d892067195236f6 -MISC ChangeLog 838 RMD160 1f43f194f9e10e5feaa9c0da9d5c340c263e35fa SHA1 c15f516cd51fe08bfde35ff02ae393e54ee60b80 SHA256 bb7e9a09aeca15fe92d61bbc28a0675ef041fc34e8e37dbdf3b03683b97e70fe +EBUILD mpe2-1.0.6_p1-r1.ebuild 3802 RMD160 3d0040b677d2477892f5658bc9aeea69c131851b SHA1 51ef2ca431aeafd7c01ce8daacbf649602a19ece SHA256 f1c0b906b45b8cb01971e25b841a7db71ca2d0c68aa5e77db683de8eaed35837 +EBUILD mpe2-1.0.6_p1.ebuild 3670 RMD160 a697e6de90ae663e91b66116aa0dae0735f3db02 SHA1 df246734a3474dad0c1a30399a95f12a622e8748 SHA256 99cf37e76465c8b2363376daa9dad6eff53b87c8b41ba7b682ca93dda91eb980 +MISC ChangeLog 1043 RMD160 88a3663b3ece6c1c0a1c58571541f7f8a527168b SHA1 f1b4842f18d886e2bff6e844b737c0e1f0cfb986 SHA256 fe6809d31954e183e12e0f5a3be496eaec893ff41a9bf637ae3bf74c6236b43e MISC metadata.xml 259 RMD160 3288242cfd053d6b014e4d69d02f37eac4e8ca75 SHA1 15229a4dacc8a1d795b2e19612c45b61d64ad280 SHA256 51ab93c579e7aa6293a3478a36318bca710b3a79d6008a77643495fa2af1526b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkyOb5UACgkQ4MrvBE1wQ8l5bwCeKIct+/G2ZXa8sfDSbIw25aMY -1RwAnRyESrnAvFlqOLVC8b19ZnFNsST+ -=xIym +iEYEARECAAYFAkyOo8MACgkQ4MrvBE1wQ8mpgQCgnY8p2EeWvUVFfIV+LYG+dzwS +hg0AnRJQTll05/ajXG+CcZHIFWqY1WOy +=YP7S -----END PGP SIGNATURE----- diff --git a/sys-cluster/mpe2/mpe2-1.0.6_p1-r1.ebuild b/sys-cluster/mpe2/mpe2-1.0.6_p1-r1.ebuild index 9bfbe60ca577..33e6c36a73b3 100644 --- a/sys-cluster/mpe2/mpe2-1.0.6_p1-r1.ebuild +++ b/sys-cluster/mpe2/mpe2-1.0.6_p1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpe2/mpe2-1.0.6_p1-r1.ebuild,v 1.1 2010/09/13 18:38:12 jsbronder Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpe2/mpe2-1.0.6_p1-r1.ebuild,v 1.2 2010/09/13 22:20:52 jsbronder Exp $ EAPI=2 inherit fortran eutils java-utils-2 @@ -122,7 +122,9 @@ src_test() { return 0 fi - emake \ + # No parallel make: + # http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1 + emake -j1 \ CC="${S}"/bin/mpecc \ FC="${S}"/bin/mpefc \ MPERUN="${ROOT}/usr/bin/mpiexec -n 4" \ @@ -137,6 +139,8 @@ src_test() { } src_install() { - emake DESTDIR="${D}" install || die + # No parallel make: + # http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1 + emake -j1 DESTDIR="${D}" install || die rm -f "${D}"/usr/sbin/mpeuninstall || die } diff --git a/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild b/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild index 9759b18f5064..55d0a5c7e4fa 100644 --- a/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild +++ b/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild,v 1.3 2009/12/28 23:48:35 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild,v 1.4 2010/09/13 22:20:52 jsbronder Exp $ EAPI=2 inherit fortran eutils java-utils-2 @@ -120,7 +120,10 @@ src_test() { return 0 fi - emake \ + + # No parallel make: + # http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1 + emake -j1 \ CC="${S}"/bin/mpecc \ FC="${S}"/bin/mpefc \ MPERUN="${ROOT}/usr/bin/mpiexec -n 4" \ @@ -135,6 +138,8 @@ src_test() { } src_install() { - emake DESTDIR="${D}" install || die + # No parallel make: + # http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1 + emake -j1 DESTDIR="${D}" install || die rm -f "${D}"/usr/sbin/mpeuninstall || die } |