Patch to fix make 3.81 hanging (backport of the fix in ghc-6.4.2)

Package-Manager: portage-2.1_pre9-r5

4 files changed, 28 insertions, 18 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 05a414c42700..a40afb59f8a1 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.97 2006/04/27 21:49:08 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.98 2006/05/02 15:33:45 dcoutts Exp $
+
+  02 May 2006; Duncan Coutts <dcoutts@gentoo.org> ghc-6.4.1-r2.ebuild,
+  ghc-6.4.1-r3.ebuild:
+  Patch to fix make-3.81 hanging (backport of the fix in ghc-6.4.2)
 
   27 Apr 2006; Duncan Coutts <dcoutts@gentoo.org>
   -files/ghc-6.4-powerpc.patch, +ghc-6.4.2.ebuild:
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index d872f54e2d65..98422abd24a0 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -33,22 +33,22 @@ EBUILD ghc-6.2.2.ebuild 5582 RMD160 b028ea26d634687c73fd8d688f6088d253230f33 SHA
 MD5 49113531ecf3c15247194f067ffe00bd ghc-6.2.2.ebuild 5582
 RMD160 b028ea26d634687c73fd8d688f6088d253230f33 ghc-6.2.2.ebuild 5582
 SHA256 4473941a958beec2da286f5823b62def6737504cd0524a4dcd6aa777847ccd1d ghc-6.2.2.ebuild 5582
-EBUILD ghc-6.4.1-r2.ebuild 6562 RMD160 c66261e4d838cdd154d20768a405a91db9d23bd3 SHA1 a1b76702b352f723fcddb4626475b05481c9e6c4 SHA256 230bfc6d51c9e7c9d8e6f231474691250a69619b85a72d4ef1f9069c212d6ffb size 6562
-MD5 4a793290021c3e25bb6d1fa6894ab623 ghc-6.4.1-r2.ebuild 6562
-RMD160 c66261e4d838cdd154d20768a405a91db9d23bd3 ghc-6.4.1-r2.ebuild 6562
-SHA256 230bfc6d51c9e7c9d8e6f231474691250a69619b85a72d4ef1f9069c212d6ffb ghc-6.4.1-r2.ebuild 6562
-EBUILD ghc-6.4.1-r3.ebuild 8096 RMD160 db88ca726f01b6ca49672eb2d8bc389a5d09e71c SHA1 3686b13c7f93c29255655c2d3dec7364015c2a28 SHA256 72993985e1fc9d69ea5532e1010ac93ee1002c2b94cfeafe39fb8e0f0dada05b size 8096
-MD5 a6f492c0d3c2751894be85c0acef1856 ghc-6.4.1-r3.ebuild 8096
-RMD160 db88ca726f01b6ca49672eb2d8bc389a5d09e71c ghc-6.4.1-r3.ebuild 8096
-SHA256 72993985e1fc9d69ea5532e1010ac93ee1002c2b94cfeafe39fb8e0f0dada05b ghc-6.4.1-r3.ebuild 8096
+EBUILD ghc-6.4.1-r2.ebuild 6681 RMD160 6495a287a2a99c9f7dc582a6e6d64ae882ca6554 SHA1 b8e18b710d0495caf69f7ed01d86f8804a1336b3 SHA256 de4b010d17f0af8ea47b3da368b34fc67417093bfbe92ad439be03c38ee022b4 size 6681
+MD5 d11fd9573adf5cb5f508e53bad0a51ae ghc-6.4.1-r2.ebuild 6681
+RMD160 6495a287a2a99c9f7dc582a6e6d64ae882ca6554 ghc-6.4.1-r2.ebuild 6681
+SHA256 de4b010d17f0af8ea47b3da368b34fc67417093bfbe92ad439be03c38ee022b4 ghc-6.4.1-r2.ebuild 6681
+EBUILD ghc-6.4.1-r3.ebuild 8215 RMD160 1986c1fff389c27382fb5fbcef21874db77cf2b2 SHA1 e08794414fa2ff37bf072a392b97499cc73d0186 SHA256 eb6a79484d289362380414fa5603cdf3ff32d9190eda79fc36f409b89c8ee2d6 size 8215
+MD5 31a35728c8761a4c208bc54464fe2d0e ghc-6.4.1-r3.ebuild 8215
+RMD160 1986c1fff389c27382fb5fbcef21874db77cf2b2 ghc-6.4.1-r3.ebuild 8215
+SHA256 eb6a79484d289362380414fa5603cdf3ff32d9190eda79fc36f409b89c8ee2d6 ghc-6.4.1-r3.ebuild 8215
 EBUILD ghc-6.4.2.ebuild 8486 RMD160 d6f4ff50323872fbd6e86b7a49793cc6924aab40 SHA1 846908cbf8997dd31546c7df5d9864a469a1ad81 SHA256 bb36db053575e29260b348f32c744eb08e6e1f875cd54845b164da3d434be94d size 8486
 MD5 8866880f729f63b013adc6bbd28c1a09 ghc-6.4.2.ebuild 8486
 RMD160 d6f4ff50323872fbd6e86b7a49793cc6924aab40 ghc-6.4.2.ebuild 8486
 SHA256 bb36db053575e29260b348f32c744eb08e6e1f875cd54845b164da3d434be94d ghc-6.4.2.ebuild 8486
-MISC ChangeLog 16869 RMD160 979aa0b14d426db261009b18181e8b4000cd209f SHA1 6c715962eb2979aeb265f16774b3cdc7c95563d8 SHA256 0c04fd99465fa993397de7388f160b8c570a3d1b1e7a5d0b310595a23cc2db91 size 16869
-MD5 1002be192d9e00829345929ffa1ae0c3 ChangeLog 16869
-RMD160 979aa0b14d426db261009b18181e8b4000cd209f ChangeLog 16869
-SHA256 0c04fd99465fa993397de7388f160b8c570a3d1b1e7a5d0b310595a23cc2db91 ChangeLog 16869
+MISC ChangeLog 17032 RMD160 7b8221074ebc5dd07a7c8e5b46252a2e38a188d2 SHA1 8ed170748273f6d8c06f59ff8613091169b003e4 SHA256 be503eed6813767262166ae1e6f39ad4858c2a77d90e602caafa5df07c60658d size 17032
+MD5 05ed3e21e4b11fc1bde0a8afb859d9d7 ChangeLog 17032
+RMD160 7b8221074ebc5dd07a7c8e5b46252a2e38a188d2 ChangeLog 17032
+SHA256 be503eed6813767262166ae1e6f39ad4858c2a77d90e602caafa5df07c60658d ChangeLog 17032
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 size 223
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
@@ -68,7 +68,7 @@ SHA256 8c2856adf89c493ccb0fc05d22489c4033e4a95188fce8e10df45a4cfeacb1e3 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEUTwO/B0cxt+cq+wRAleJAJ9XaIkh1DUVuDfuLK1PjPycjaiTvwCeISjt
-sAqkqBxcaTvB0+zFEwEN3yQ=
-=lev2
+iD8DBQFEV3uF/B0cxt+cq+wRArPGAJ0UoL+4P+AHIqLs1ynzwM+C9gW1SQCfafjk
+VO6pCAxxbHxf4pVxLorheuc=
+=jVri
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ghc/ghc-6.4.1-r2.ebuild b/dev-lang/ghc/ghc-6.4.1-r2.ebuild
index 1823c28a8e90..949f8c0713df 100644
--- a/dev-lang/ghc/ghc-6.4.1-r2.ebuild
+++ b/dev-lang/ghc/ghc-6.4.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.1-r2.ebuild,v 1.12 2006/03/28 17:28:48 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.1-r2.ebuild,v 1.13 2006/05/02 15:33:45 dcoutts Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -91,6 +91,9 @@ src_unpack() {
 	echo "SCRIPT_SUBST_VARS += GHC_CFLAGS" >> "${S}/ghc/driver/ghc/Makefile"
 	echo "GHC_CFLAGS = ${GHC_CFLAGS}"      >> "${S}/ghc/driver/ghc/Makefile"
 	sed -i -e 's|$TOPDIROPT|$TOPDIROPT $GHC_CFLAGS|' "${S}/ghc/driver/ghc/ghc.sh"
+
+	# Patch to fix make-3.81 hanging (backport of the fix in ghc-6.4.2)
+	sed -i -e 's/.SECONDARY://' "${S}/mk/suffix.mk"
 }
 
 src_compile() {
diff --git a/dev-lang/ghc/ghc-6.4.1-r3.ebuild b/dev-lang/ghc/ghc-6.4.1-r3.ebuild
index 056a778d9365..0e57021fe00f 100644
--- a/dev-lang/ghc/ghc-6.4.1-r3.ebuild
+++ b/dev-lang/ghc/ghc-6.4.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.1-r3.ebuild,v 1.4 2006/04/27 21:41:38 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.1-r3.ebuild,v 1.5 2006/05/02 15:33:45 dcoutts Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -139,6 +139,9 @@ src_unpack() {
 
 	# Patch to fix parallel make
 	sed -i 's/mkDerivedConstants.c : $(H_CONFIG)/mkDerivedConstants.c :	$(H_CONFIG) $(H_PLATFORM)/' "${S}/ghc/includes/Makefile"
+
+	# Patch to fix make-3.81 hanging (backport of the fix in ghc-6.4.2)
+	sed -i -e 's/.SECONDARY://' "${S}/mk/suffix.mk"
 }
 
 src_compile() {