Disable parallel make due to build system failures: bug #409631 by Anton Kochkov, bug #409873 by Todd Goodman.

Package-Manager: portage-2.2.0_alpha96_p5/cvs/Linux x86_64

6 files changed, 25 insertions, 19 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 79af65694cff..eeae8008734f 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.217 2012/04/04 18:21:27 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.218 2012/04/13 19:01:18 slyfox Exp $
+
+  13 Apr 2012; Sergei Trofimovich <slyfox@gentoo.org> ghc-6.10.4-r1.ebuild,
+  ghc-6.12.3-r2.ebuild, ghc-6.12.3.ebuild, ghc-7.4.1.ebuild:
+  Disable parallel make due to build system failures: bug #409631 by Anton
+  Kochkov, bug #409873 by Todd Goodman.
 
   04 Apr 2012; Sergei Trofimovich <slyfox@gentoo.org> ghc-6.12.3-r2.ebuild:
   alpha/ia64/ppc/ppc64/sparc stable wrt bug #407835
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 46b33fcae248..a5ac20dd7486 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -71,17 +71,17 @@ DIST ghc-bin-7.4.1-ppc.tbz2 89826596 RMD160 b87b68c9ef29dcda32bfc001ad521b74e334
 DIST ghc-bin-7.4.1-ppc64.tbz2 101724506 RMD160 90cbe2fc40b3373e9a113eadd3e0b2e5b8e83553 SHA1 a9ab49fdcccebc0f191e533133a0387791326dc4 SHA256 6aef001a91281cf9a45a6a00f8aeacefa1b04a67c05a77eaff245290ded6fb5b
 DIST ghc-bin-7.4.1-sparc.tbz2 117317699 RMD160 380f218db33edf7728a091aaf5539c6135131291 SHA1 68d864c62969c1c0ffdff845d05168c2526cbc4e SHA256 c318674f5ffe5fae91becaf5747a1fb27f90fea50893766468bb729ce45ccf3f
 DIST ghc-bin-7.4.1-x86.tbz2 91033605 RMD160 35b3d9a82a39a28c91129e72cea13f06059b846b SHA1 f5bca10026320f7bfb40d3d49fef743050c60f64 SHA256 e5ff322b0496519b8bb879c9c87a25cd2d89921c89850b8fd21247cfd281e942
-EBUILD ghc-6.10.4-r1.ebuild 13011 RMD160 4feb3ad764af5ad16b3dd5a000d49755c8b91c2a SHA1 c8eb3181598c05053e1f27b5fdb2a3a4264377b1 SHA256 f8c163192a9c5a62158bbb5698cef9872fa0e64956689aeafb3f90c8c9670b0a
-EBUILD ghc-6.12.3-r2.ebuild 20508 RMD160 151fbf4cacd787bcfd9a8d9d59a6a358db752231 SHA1 0878f823230a84512ce24432847e70d02e7cc523 SHA256 922db75e855c4e046f5b162da77443de00c58ce221117ce6d9dc56df451c8e34
-EBUILD ghc-6.12.3.ebuild 15063 RMD160 6476ac66f125ad0d2c13351a73e560b1df67c822 SHA1 15d9cd33ba4bb23b31d8a03111d31d4bd1bfe603 SHA256 f968048385c848f60007ea9bca2598c7d26a06a02945557b912dd587636d3ece
+EBUILD ghc-6.10.4-r1.ebuild 13015 RMD160 540f5f7ea1ee0b37c4ffaf7db5dfad398fce0711 SHA1 51ddf8879fbda68c67e9c6c1ded0190f2abb3d16 SHA256 63be2b4343c65f3b12699355b0bf28fccc1518eedd77ccaa902fe3207ee1d16c
+EBUILD ghc-6.12.3-r2.ebuild 20512 RMD160 06c922cea1ec6b9de74beced959c20e87efe506d SHA1 a769c5abab43f125d13b8ad4ccd261fab0ed8eeb SHA256 b25cb0d0793647836fd36ca7753a23874607e62e005ac78b0d17f660495901aa
+EBUILD ghc-6.12.3.ebuild 15067 RMD160 d2085cb62d3d1f02ae1aeece6f5d7eedc043d8bb SHA1 1d42ba8dd60f239af8ecfda0d7c24b73050d2ac9 SHA256 85d10ae535a35d5b2a78852f380fe1dd66a06572f605ffbd472c47ff402ec102
 EBUILD ghc-7.0.4.ebuild 20079 RMD160 46666d45829791995f06034ccc3479c55ab7ed99 SHA1 920d5debdbee58aeb36b614e855d6dcfaf2eb974 SHA256 0f9e20b908d61685e5725fbefc9ae4d65c4a3ae53179054492902dd8638d5d5f
-EBUILD ghc-7.4.1.ebuild 20396 RMD160 7d7bf32a1cf25dcf689d8dd11672e394382acab0 SHA1 2f23a35f3784bf9c60d1ea49047272b4b70a2f6a SHA256 c01a03bc2ad6e6134efac1a9825d1266b88390f4ca208321d9188a6917b15987
-MISC ChangeLog 39913 RMD160 80fcc037445da20f720fac3a773863076d1cc3cd SHA1 a4fda9a91dbd38194ffc8ee15b4c56828a47c079 SHA256 7fd7d3318b810d9c1b50de04d4bc6546a5624611c6e2eba7151e87a4c325ee79
+EBUILD ghc-7.4.1.ebuild 20450 RMD160 e85827638c46e85e35b9537a89525e62f60b2890 SHA1 42205ce6d5971ded7057ee43e9dad1df8077734f SHA256 8a0a3b104ddbb23c2de1128b60f194108739330d35bafc4c8349f62113a759c9
+MISC ChangeLog 40166 RMD160 124a43073a8980afdbecf75a92033bef94397dfb SHA1 cea849696662b40de0313c27c06fc549e3008214 SHA256 8564e9acbe2608ee3ee0d96396447fae9b8245d15a7e46395183bacdc958cbd9
 MISC metadata.xml 511 RMD160 79a995fb7989ead0e2a1aaae42a015a34864e2ff SHA1 a7222153de1350459b28c0be825beeb13c0aa16e SHA256 4474d6b9638e6b78e16025c88b5455fa353ca723c05ce80aa3f8b426149ec1dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk98kkwACgkQcaHudmEf86otuwCfUAwnOlJxdohMD0Ng/kxyNlBh
-YrsAn3hmHdB3dEmHKgdzH4DogyXv/wC5
-=Jcpf
+iEYEARECAAYFAk+IeSoACgkQcaHudmEf86oljQCfYJs2mIetv9GkkIXwleX0puiP
+wygAn3661Rgg4pjIQdJ/fcVlKAgEVnh3
+=kLou
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ghc/ghc-6.10.4-r1.ebuild b/dev-lang/ghc/ghc-6.10.4-r1.ebuild
index eb0cd852b6f2..a34dc420a49b 100644
--- a/dev-lang/ghc/ghc-6.10.4-r1.ebuild
+++ b/dev-lang/ghc/ghc-6.10.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild,v 1.12 2010/11/06 20:28:25 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild,v 1.13 2012/04/13 19:01:18 slyfox Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -279,7 +279,7 @@ src_compile() {
 
 		# LC_ALL needs to workaround ghc's ParseCmm failure on some (es) locales
 		# bug #202212 / http://hackage.haskell.org/trac/ghc/ticket/4207
-		LC_ALL=C emake all || die "make failed"
+		LC_ALL=C emake -j1 all || die "make failed"
 
 	fi # ! use binary
 }
diff --git a/dev-lang/ghc/ghc-6.12.3-r2.ebuild b/dev-lang/ghc/ghc-6.12.3-r2.ebuild
index cb3a968a9c19..5d28f3f8ff12 100644
--- a/dev-lang/ghc/ghc-6.12.3-r2.ebuild
+++ b/dev-lang/ghc/ghc-6.12.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.12.3-r2.ebuild,v 1.6 2012/04/04 18:21:27 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.12.3-r2.ebuild,v 1.7 2012/04/13 19:01:18 slyfox Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -459,7 +459,7 @@ src_compile() {
 	if ! use binary; then
 		# LC_ALL needs to workaround ghc's ParseCmm failure on some (es) locales
 		# bug #202212 / http://hackage.haskell.org/trac/ghc/ticket/4207
-		LC_ALL=C emake all || die "make failed"
+		LC_ALL=C emake -j1 all || die "make failed"
 	fi # ! use binary
 }
 
diff --git a/dev-lang/ghc/ghc-6.12.3.ebuild b/dev-lang/ghc/ghc-6.12.3.ebuild
index ffaed03744c5..c959d816d6fd 100644
--- a/dev-lang/ghc/ghc-6.12.3.ebuild
+++ b/dev-lang/ghc/ghc-6.12.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.12.3.ebuild,v 1.22 2011/07/05 18:30:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.12.3.ebuild,v 1.23 2012/04/13 19:01:18 slyfox Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -313,7 +313,7 @@ src_compile() {
 
 		# LC_ALL needs to workaround ghc's ParseCmm failure on some (es) locales
 		# bug #202212 / http://hackage.haskell.org/trac/ghc/ticket/4207
-		LC_ALL=C emake all || die "make failed"
+		LC_ALL=C emake -j1 all || die "make failed"
 
 	fi # ! use binary
 }
diff --git a/dev-lang/ghc/ghc-7.4.1.ebuild b/dev-lang/ghc/ghc-7.4.1.ebuild
index e9dc1c56f3a1..dfca51ec41a9 100644
--- a/dev-lang/ghc/ghc-7.4.1.ebuild
+++ b/dev-lang/ghc/ghc-7.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.1.ebuild,v 1.3 2012/03/11 18:43:38 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.1.ebuild,v 1.4 2012/04/13 19:01:18 slyfox Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -470,7 +470,8 @@ src_configure() {
 
 src_compile() {
 	if ! use binary; then
-		emake all || die "make failed"
+		# ghc massively parallel make: #409631, #409873
+		emake -j1 all || die "make failed"
 	fi # ! use binary
 }