Fix compilation issue with dev-lang/ghc. See bug #310963.

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

3 files changed, 17 insertions, 10 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 846603b6da0b..cfce2f984978 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.173 2010/01/26 19:54:10 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.174 2010/03/25 21:00:52 kolmodin Exp $
+
+  25 Mar 2010; Lennart Kolmodin <kolmodin@gentoo.org>
+  files/ghc-6.12.1-configure-CHOST.patch:
+  Fix building with CHOST="i486-pc-linux-gnu".
+  Issue reported by Sergey Mironov <ierton@gmail.com>,
+  patch contributed by Sergei Trofimovich <slyfox@inbox.ru>.
+  For details, see bug #310963.
 
 *ghc-6.12.1 (26 Jan 2010)
 
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index ed18729992c0..7b33b6ad5cfc 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -8,7 +8,7 @@ AUX ghc-6.10.4-autoconf.patch 2010 RMD160 c5154aca1828ff5bf5289da6167c2218ad6cb1
 AUX ghc-6.10.4-libm-detection.patch 1791 RMD160 37cf97b3477fbe3af11d558f0a5b83979c08e7a3 SHA1 2049ad0966df39ad298d7bc96d7a06e5bd52de71 SHA256 05eaaadb68ae16b7569a722008bc9a697c9dae84673b285400c6744cb600a3a9
 AUX ghc-6.10.4-ppc64-always-minimal-toc.patch 289 RMD160 a0d32897bf9984050e36ab917c8ec4a5d1e29649 SHA1 d9961d4ae8d14ab59fe50952fb7aa92b55cb5185 SHA256 4d06007ca8a0542e120a189d49c743c1982f5b098504e031327b51f912cd69ad
 AUX ghc-6.10.4-propagate-hc-options-to-all-libraries.patch 2976 RMD160 f8947d8952bca884bbe894d3a74b0b3dd86a281e SHA1 a8c18dfb970767fdf9150ac157e95a61b8b9d92e SHA256 d8d191dea237d2492202fbc528deaebe5df7a48201868a2b969a5865758cb4cb
-AUX ghc-6.12.1-configure-CHOST.patch 755 RMD160 f3cee0ef90eb42ccd638b50737e381cec0a63077 SHA1 77dab196fd34ec0decbd559ba3d8b3bc9c7b881e SHA256 5df60d99710be95b4c57d75bec975ae23fb13b42f7fee21dc143f0f1fa0efc47
+AUX ghc-6.12.1-configure-CHOST.patch 851 RMD160 b85347a79d52270e1077c5a6e6ad675dd9a9b24d SHA1 e271c878ad3a7a00078c01858923ab6b814b2474 SHA256 b4e1ebeea2fdd1e04f14140fe07d991ac583f221bc79f0eb175fb378ed12cd69
 AUX ghc-6.4.2-sparc32plus.patch 526 RMD160 970d062362284659c2570394c8f9328d8096ea8e SHA1 40d25c25a3cd6a228f3757b8e298fd8c72710544 SHA256 a05bd16c9308ec9f608aeabe0ea35e2dff6826f262108d1ccb16c4f93a2d3a44
 AUX ghc-6.4.2-sparcmangler.patch 837 RMD160 7e3a2a94bb62c3c0da09f08096481cace2b1bb96 SHA1 5faccb311239c4c4d07a2c6dc507d51a18c2bc96 SHA256 3987724420c6d4b552c6fbb3b3ca10fca8aaa73573735aa3de824d3dc65f94af
 AUX ghc-6.5-norelax.patch 613 RMD160 71012d8615e164c72d0db75c8cc606ccf8e3ddd9 SHA1 4bab0e904d9950ba92e16b3932635e5a1c3edee1 SHA256 0da9630bbd28edee7538d857dbeefd6d4cdddafd198499e61513f2f4d44c2fc0
@@ -80,12 +80,12 @@ EBUILD ghc-6.6.1.ebuild 12238 RMD160 389782acd6d8ae37e6ffd72fb71667f3c1f04ccb SH
 EBUILD ghc-6.6.ebuild 10777 RMD160 141e86d9cf0525a8aff69b9a70ab1522b078ec62 SHA1 c432175362c80acbea221137d50467c8f065985b SHA256 28e0f78ed977d31ee301c726fd0be830b161c8830e6344d55d4c51113c50acb1
 EBUILD ghc-6.8.2-r1.ebuild 8952 RMD160 5c4832a7ca6dc41d217c0d5ebb677afd2ae5b174 SHA1 0b321957d4f9ddccf1614a6c5d901649125c6a8e SHA256 8699169558e85a23675058d9b70a0017c3207b6637db6f352b389e076cbe5baf
 EBUILD ghc-6.8.2.ebuild 9063 RMD160 d2842f4e26583fa1befecc0ad01a54983830a48a SHA1 8d52f906227815f0049d1403c302415bbd828c20 SHA256 c5ac2c32efce96ac677851ed85d6c0504a5bbbbaaba63ef383225795ab126bba
-MISC ChangeLog 29937 RMD160 3da25fd1568b6a1d60d9f287098ab06cb61713fa SHA1 4abe9102a33eeb5d5411bb08fbd473ee71f21fdf SHA256 f772557a7045fcb9848a837d5b783b7628327b16d9e5024b17c3e966846a0d07
+MISC ChangeLog 30229 RMD160 6ebe4c06fbbb6af04f3843720d3996c0afc980c6 SHA1 6a81792021243a283f8170844117b3f9da295707 SHA256 4077e521dd5ea4313cb9dae0264abdd8686467a212e53a57df2d21c7b6ea4740
 MISC metadata.xml 442 RMD160 9cfa0af9084477c8a70ecf0ac3fb3093ae0cd602 SHA1 be2833090f093ac1c8fc2f5c6f3f253bdbdd6b96 SHA256 2bacbdfcaea11289949a687626f59f99af8fda9ec495b2c349ce5898d9f0dcd4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktfSHoACgkQ1n/CYbXjntLStQCePwzYkGdhAiDGVBpDpCt4b8ED
-Pm8AnAgmy1zyLe+JZ0n7VDSWVF5eHGDj
-=DpLb
+iEYEARECAAYFAkurzwwACgkQ1n/CYbXjntKU7wCfbPMu8NVDHMvpPvK+mIjX+OmJ
+DpYAnjZropKW2imLwOdabcOJTjtI3Qhb
+=OC38
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ghc/files/ghc-6.12.1-configure-CHOST.patch b/dev-lang/ghc/files/ghc-6.12.1-configure-CHOST.patch
index cbb288cc06c2..3369d703889d 100644
--- a/dev-lang/ghc/files/ghc-6.12.1-configure-CHOST.patch
+++ b/dev-lang/ghc/files/ghc-6.12.1-configure-CHOST.patch
@@ -5,7 +5,7 @@
      fi
  fi
 +build=`echo "$build" | sed -e 's/linux-gnu/linux/' -e 's/-pc-/-unknown-/'`
-+build=`echo "$build" | sed -e 's/i686/i386/'`
++[build=`echo "$build" | sed -e 's/i[4-6]86/i386/'`] # escaping square bracket
  
  if test "$host" = ""
  then
@@ -14,7 +14,7 @@
      fi
  fi
 +host=`echo "$host" | sed -e 's/linux-gnu/linux/' -e 's/-pc-/-unknown-/'`
-+host=`echo "$host" | sed -e 's/i686/i386/'`
++[host=`echo "$host" | sed -e 's/i[4-6]86/i386/'`] # escaping square bracket
  
  if test "$target" = ""
  then
@@ -23,7 +23,7 @@
      fi
  fi
 +target=`echo "$target" | sed -e 's/linux-gnu/linux/' -e 's/-pc-/-unknown-/'`
-+target=`echo "$target" | sed -e 's/i686/i386/'`
++[target=`echo "$target" | sed -e 's/i[4-6]86/i386/'`] # escaping square bracket
  
  exeext=''
  soext='.so'