From: Lennart Kolmodin <kolmodin@gentoo.org>
Date: Sat, 10 Mar 2007 13:47:00 +0000 (+0000)
Subject: Add missing patch to dev-lang/ghc-6.6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=54b58ce430dabe9731c0c87ff51a1f8fa9c7b982;p=gentoo.git

Add missing patch to dev-lang/ghc-6.6
Package-Manager: portage-2.1.2-r5
---

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 98f2aec78705..9150ff5b82eb 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.116 2007/03/07 18:03:59 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.117 2007/03/10 13:47:00 kolmodin Exp $
+
+  10 Mar 2007; <kolmodin@gentoo.org> +files/ghc-6.5-norelax.patch:
+  Add missing ghc-6.6 patch.
 
 *ghc-6.6 (07 Mar 2007)
 
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 4e8f58bd9e24..1df0f5792283 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -29,6 +29,10 @@ AUX ghc-6.4.2-sparcmangler.patch 837 RMD160 7e3a2a94bb62c3c0da09f08096481cace2b1
 MD5 c42b26cfaf5469b236c345e1614370cc files/ghc-6.4.2-sparcmangler.patch 837
 RMD160 7e3a2a94bb62c3c0da09f08096481cace2b1bb96 files/ghc-6.4.2-sparcmangler.patch 837
 SHA256 3987724420c6d4b552c6fbb3b3ca10fca8aaa73573735aa3de824d3dc65f94af files/ghc-6.4.2-sparcmangler.patch 837
+AUX ghc-6.5-norelax.patch 578 RMD160 f41d1b9f93cff339fac01660bfeed5d2aeb32757 SHA1 eaa20567d6c0176f92aadc9784141aeda5d65875 SHA256 fb1bdd958116b5b17b4233517c45bee243a9b4503b20469d23b3d716d2889cac
+MD5 406397414acecec0aa1eb548bac52099 files/ghc-6.5-norelax.patch 578
+RMD160 f41d1b9f93cff339fac01660bfeed5d2aeb32757 files/ghc-6.5-norelax.patch 578
+SHA256 fb1bdd958116b5b17b4233517c45bee243a9b4503b20469d23b3d716d2889cac files/ghc-6.5-norelax.patch 578
 AUX ghc-updater 9045 RMD160 b044a26add18464b583702f3cac667521c5eb06f SHA1 f5ccd2bf9f78f895368a1ff64ceddd5703f1d13b SHA256 eafc2eb58a9c1ad0263fd498cad00f50b0d04860cd8e26aa201910f77d74efbe
 MD5 e7ba0887c43fd8333a4d1bd92c184244 files/ghc-updater 9045
 RMD160 b044a26add18464b583702f3cac667521c5eb06f files/ghc-updater 9045
@@ -59,10 +63,10 @@ EBUILD ghc-6.6.ebuild 9812 RMD160 b5f9b11bf5ba43fec8e0f5cec4c6c7416d91bdec SHA1
 MD5 d52645475e54def8f4299c4b7646a1f8 ghc-6.6.ebuild 9812
 RMD160 b5f9b11bf5ba43fec8e0f5cec4c6c7416d91bdec ghc-6.6.ebuild 9812
 SHA256 6e3389c5fc94f7ad17e13b2fdc256114243c829d789020a6b2852c34b7c905bc ghc-6.6.ebuild 9812
-MISC ChangeLog 20197 RMD160 d6abc25256fd46e52268140461738708cb8df1d8 SHA1 058be03191f4a9bcb5d2817aa7b6d35696a9341a SHA256 194bf54a2c7d5130bb1f69a1464e095c27cac79aa409209cba9ad11708493817
-MD5 24b654c5911e986a7c555204c872b70b ChangeLog 20197
-RMD160 d6abc25256fd46e52268140461738708cb8df1d8 ChangeLog 20197
-SHA256 194bf54a2c7d5130bb1f69a1464e095c27cac79aa409209cba9ad11708493817 ChangeLog 20197
+MISC ChangeLog 20294 RMD160 55ff6d9ac1340c82142c74a4f73ef815302bc51a SHA1 0b1b3198676cae335d3afaa0347607f0eb85b366 SHA256 21c615780daf05e14a8a4ab3cd8f5c6f0b99fe1c17f790f2b05af78d2867fc55
+MD5 d45f3220ead1e9bf33023fbe315c8cf0 ChangeLog 20294
+RMD160 55ff6d9ac1340c82142c74a4f73ef815302bc51a ChangeLog 20294
+SHA256 21c615780daf05e14a8a4ab3cd8f5c6f0b99fe1c17f790f2b05af78d2867fc55 ChangeLog 20294
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
@@ -85,7 +89,7 @@ SHA256 08a1beeb6d4f6f1f6c33e3db553861106f19cfc95d6c84ef410efdae2ae6bda6 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF7v6c1n/CYbXjntIRAqkAAJ9eG1iKs0y7LcmqIz4xWS38skBu+QCfU5BZ
-0fnful5qYICNsIQAtwdyrn4=
-=jdjn
+iD8DBQFF8rbn1n/CYbXjntIRAq/3AKCEV6ySBLaqkC8pmkldlfKsAEIY7QCfe4zX
+r485+7zoRjBIuGyNriL93wQ=
+=jokb
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ghc/files/ghc-6.5-norelax.patch b/dev-lang/ghc/files/ghc-6.5-norelax.patch
new file mode 100644
index 000000000000..d4dc386c97c5
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-6.5-norelax.patch
@@ -0,0 +1,13 @@
+diff -rN -u old-ghc-1/compiler/main/DriverPipeline.hs new-ghc/compiler/main/DriverPipeline.hs
+--- old-ghc-1/compiler/main/DriverPipeline.hs	2006-09-13 10:33:23.000000000 +0200
++++ new-ghc/compiler/main/DriverPipeline.hs	2006-09-13 10:33:23.000000000 +0200
+@@ -1014,6 +1014,8 @@
+ 	let ld_r args = SysTools.runLink dflags ([ 
+ 				SysTools.Option "-nostdlib",
+ 				SysTools.Option "-nodefaultlibs",
++				-- options '--relax' and '-r' are incompatible
++				SysTools.Option "-mno-relax",
+ 				SysTools.Option "-Wl,-r", 
+ 				SysTools.Option ld_x_flag, 
+ 				SysTools.Option "-o", 
+