Added patch for compilation on ppc32 and added binary build.

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

4 files changed, 41 insertions, 8 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index ac75d80da78b..de4b70d0362d 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.209 2011/08/23 18:08:05 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.210 2011/12/28 08:47:34 josejx Exp $
+
+  28 Dec 2011; Joseph Jezak <josejx@gentoo.org> ghc-7.0.4.ebuild,
+  +files/ghc-7.0.4-fix-ppc-linker.patch:
+  Added patch for compilation on ppc32 and added binary build.
 
   23 Aug 2011; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.0.4.ebuild,
   +files/ghc-7.0.4-nxstack.patch:
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 198923324274..01e07529a08d 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -29,6 +29,7 @@ AUX ghc-7.0.2-CHOST.patch 3027 RMD160 c33e8ab30ffba0e930772784144f7891072e88c3 S
 AUX ghc-7.0.4-CHOST-prefix.patch 272 RMD160 740e2bb11688261865d9d5bc3f16c0d37f38ab21 SHA1 746515ea3c023ce5aa91df87b3592dbdc8d28202 SHA256 83942dfcbe1968c7f5e0ae09e4d84d77d85778839814fca1689e168cad3a4f66
 AUX ghc-7.0.4-CHOST-softfloat.patch 371 RMD160 91988c43d3ec589a49707979eb8c6d785eb39c11 SHA1 df27b850c7fe5ea60cdabdc84df22ee5ab711118 SHA256 90e04c7d56612d24920a1801865b8e53f6ac1e291a11a6219f939117613e5976
 AUX ghc-7.0.4-darwin8.patch 486 RMD160 475b8276380291d6c88866fc021fc33c795f28d9 SHA1 1c10dda546a339bb206e3d7047314c7b377d9254 SHA256 b0857679f29aab3719df5538a2f104924cf5df913927a2748be3f77d2c8ea481
+AUX ghc-7.0.4-fix-ppc-linker.patch 732 RMD160 139a1ea0b5ee6dfbe5c457f86199b35be66c441b SHA1 f17b6f016b85f1effa511f30f808f26720eb55e1 SHA256 983689df4b59985ffc2aa116f553d91c9743610e671530350d7b2c55998d1549
 AUX ghc-7.0.4-nxstack.patch 984 RMD160 e475ccc5cc6e06bb736ebb84c72135bc94434d99 SHA1 3cafa50092d0607728999c93225aa4dd67b4a451 SHA256 325f00f12922edaf54e6df56acc7743e40234c53e2f341b9a28e4fe22fb4569f
 AUX ghc-apply-gmp-hack 2585 RMD160 1246e8fc40bbbb28f52f755457feca97bf3e22cc SHA1 63a7999b829548f82bcdcc4da869956abe2890bf SHA256 0d3c9e52be232734c916e9765fae770225ad6fb04c0948780867450401ff1eed
 AUX ghc-bash-completion 6496 RMD160 61574aab2f8ed4ae906df5ac291f528384b79b87 SHA1 a0d7c264cc8ff3d235511e151dc82f9e16691bac SHA256 82a862bea2c9248e06fcf74d307de07b05a55f9eb95f412762bd02e53fece822
@@ -57,18 +58,19 @@ DIST ghc-bin-6.12.3-x86.tbz2 82262946 RMD160 8256df61e6998d819c7d40d613037c5f313
 DIST ghc-bin-7.0.4-alpha.tbz2 111174890 RMD160 efefd10c170e67c3b4b2390fb6bc40bdf4167ba0 SHA1 e90397df11e41aa1b8138b9c5de3caa516d5cec5 SHA256 a83e77b23b49b5d5e47d55019ff7583802b074b5fc48df622572931252391107
 DIST ghc-bin-7.0.4-amd64.tbz2 82353700 RMD160 89a3520ab32a11ef1359a454705d955055845132 SHA1 87350c1186b6033bd0deb9918be7974c07975a4c SHA256 7232ee42a99046d084668cb08d5a7b80ee0adeaf4b26fa5b900b9ea2759bd807
 DIST ghc-bin-7.0.4-arm.tbz2 113773534 RMD160 f8e8827b47b9c73cc12594f25d5afc4c24dba883 SHA1 0ed57f08149dbdc2980208da135e36d0f4a36cea SHA256 cad8248628d33f2f02a46fd8c40170f75273f3dbb8e443a427fcad2840911138
+DIST ghc-bin-7.0.4-ppc.tbz2 95836292 RMD160 d788b8fc4af89c0d6111f70acd8e6afcb95f5c30 SHA1 98fc374dad79171308dcf295e4cac48d06af61f0 SHA256 7ecb2c963da8ad3190dc923c70485ea9abcb5c1bc5e3458b6b0217da997ef3c7
 DIST ghc-bin-7.0.4-sparc.tbz2 82859870 RMD160 39494fbf3dc6c4ec553219281f3a2b0338f5be96 SHA1 a7dc521ed68d69a07d3c5988a1fd4b9502a7deab SHA256 72e067091fa2108c9b5c42bce833e2ac853a9c3bb3406ae23d1d25b5c71168e2
 DIST ghc-bin-7.0.4-x86.tbz2 81814964 RMD160 c901d8b58679d243fa0e77ac7b8d0b6c63fc4bbc SHA1 1a31ff2813bfa0ca8d2dda2d501f95d396974eed SHA256 45450fea47fb8b6cea50bcd7b6c78d121ba6444a5e70f8a53b81009cedcc5838
 EBUILD ghc-6.10.4-r1.ebuild 13011 RMD160 4feb3ad764af5ad16b3dd5a000d49755c8b91c2a SHA1 c8eb3181598c05053e1f27b5fdb2a3a4264377b1 SHA256 f8c163192a9c5a62158bbb5698cef9872fa0e64956689aeafb3f90c8c9670b0a
 EBUILD ghc-6.12.3-r2.ebuild 20515 RMD160 6db339fd7d94a8db5d8cd30730037151855bbaf9 SHA1 be6f59c823756aab0ce6c8e492469855b6d04cde SHA256 2a14fff51f910460049540a77e006e0978e7f623907b273bacf779c88d418694
 EBUILD ghc-6.12.3.ebuild 15063 RMD160 6476ac66f125ad0d2c13351a73e560b1df67c822 SHA1 15d9cd33ba4bb23b31d8a03111d31d4bd1bfe603 SHA256 f968048385c848f60007ea9bca2598c7d26a06a02945557b912dd587636d3ece
-EBUILD ghc-7.0.4.ebuild 19971 RMD160 0c5427d6b7ca7ca6c390bc3b0134b8fbf7e4f337 SHA1 d04b9475b3e1518b9e728b28ff8251c6c1f85449 SHA256 e526024a54937f560ee7e9a2d26b0189021687475334f1a7276f49a40e5064ef
-MISC ChangeLog 38671 RMD160 7954dc4d928bb248b059ddc0c6450140e6ec7987 SHA1 f9d26f62d17215372770ae113fa578f0c0bb5f72 SHA256 23aa6c8736e61aaba18071d816d2c34b6d213b7edd50d6bab97621556eadafda
+EBUILD ghc-7.0.4.ebuild 20049 RMD160 fd342034898b4773851bc039cfac39787374fb67 SHA1 82310689c605c0152ade15c45762b0ae1fc458e7 SHA256 adc186f93e32c4adff6a282a942c3b177aed7f70c599de16e156a87df82d2b69
+MISC ChangeLog 38842 RMD160 bf47b8897cce18e2b59b8584218662f7af8c9397 SHA1 72f9216ce66c924330418504157583315c51fb3f SHA256 4e195a1a9dedc592c267cd1a98a9e6f6224c95d5252dedbf52fbc704799e1277
 MISC metadata.xml 511 RMD160 79a995fb7989ead0e2a1aaae42a015a34864e2ff SHA1 a7222153de1350459b28c0be825beeb13c0aa16e SHA256 4474d6b9638e6b78e16025c88b5455fa353ca723c05ce80aa3f8b426149ec1dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5T7VQACgkQcaHudmEf86qOGQCghDscPe8FixZdkr7/WKm6rUFI
-pMUAn3kCo7ZvnvjU+S2NxLWmMof4cbOk
-=OCUi
+iEYEARECAAYFAk7617QACgkQcsIHjyDViGTYUACg6Nk8wZP4H4HGKYi59M3oOY6r
+PVcAoONlba0FzvQqw0QaBqUQAd/QDvGG
+=uJHP
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ghc/files/ghc-7.0.4-fix-ppc-linker.patch b/dev-lang/ghc/files/ghc-7.0.4-fix-ppc-linker.patch
new file mode 100644
index 000000000000..42caa7f7db88
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-7.0.4-fix-ppc-linker.patch
@@ -0,0 +1,23 @@
+commit 243c304273a1254418aeacf4d81cadb2d59945ad
+Author: Erik de Castro Lopo <erikd@mega-nerd.com>
+Date:   Mon Apr 4 22:40:15 2011 +1000
+
+    Fix compiling on linux-powerpc.
+
+diff --git a/rts/Linker.c b/rts/Linker.c
+index 5285ec6..c840857 100644
+--- a/rts/Linker.c
++++ b/rts/Linker.c
+@@ -2572,7 +2572,11 @@ static void
+ ocFlushInstructionCache( ObjectCode *oc )
+ {
+     /* The main object code */
+-    ocFlushInstructionCacheFrom(oc->image + oc->misalignment, oc->fileSize);
++    ocFlushInstructionCacheFrom(oc->image
++#ifdef darwin_HOST_OS
++            + oc->misalignment
++#endif
++            , oc->fileSize);
+ 
+     /* Jump Islands */
+     ocFlushInstructionCacheFrom(oc->symbol_extras, sizeof(SymbolExtra) * oc->n_symbol_extras);
diff --git a/dev-lang/ghc/ghc-7.0.4.ebuild b/dev-lang/ghc/ghc-7.0.4.ebuild
index 601dc1cdf4ad..060cab0b7082 100644
--- a/dev-lang/ghc/ghc-7.0.4.ebuild
+++ b/dev-lang/ghc/ghc-7.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.0.4.ebuild,v 1.3 2011/08/23 18:08:05 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.0.4.ebuild,v 1.4 2011/12/28 08:47:34 josejx Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -43,7 +43,7 @@ arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha
 arch_binaries="$arch_binaries arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-${PV}-arm.tbz2 )"
 arch_binaries="$arch_binaries amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-${PV}-amd64.tbz2 )"
 #arch_binaries="$arch_binaries ia64?  ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
-#arch_binaries="$arch_binaries ppc? ( mirror://gentoo/ghc-bin-${PV}-ppc.tbz2 )"
+arch_binaries="$arch_binaries ppc? ( mirror://gentoo/ghc-bin-${PV}-ppc.tbz2 )"
 #arch_binaries="$arch_binaries ppc64? ( mirror://gentoo/ghc-bin-${PV}-ppc64.tbz2 )"
 arch_binaries="$arch_binaries sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-${PV}-sparc.tbz2 )"
 arch_binaries="$arch_binaries x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-${PV}-x86.tbz2 )"
@@ -70,6 +70,9 @@ yet_binary() {
 		x86)
 			return 0
 			;;
+		ppc)
+			return 0
+			;;
 		*)
 			return 1
 			;;
@@ -364,6 +367,7 @@ src_prepare() {
 		epatch "${FILESDIR}"/${PN}-7.0.4-darwin8.patch
 		epatch "${FILESDIR}"/${PN}-6.12.3-mach-o-relocation-limit.patch
 		epatch "${FILESDIR}"/${PN}-7.0.4-nxstack.patch
+		epatch "${FILESDIR}/ghc-7.0.4-fix-ppc-linker.patch"
 
 		if use prefix; then
 			# Make configure find docbook-xsl-stylesheets from Prefix