Add <haddock-2 blocker to ghc-6.10.4, add ppc64 binaries and patches to ghc 6.10.4.

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

5 files changed, 83 insertions, 23 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 09259872db5d..8b462799dcd2 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.169 2009/09/10 09:01:21 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.170 2009/09/16 06:50:28 kolmodin Exp $
+
+  16 Sep 2009; Lennart Kolmodin <kolmodin@gentoo.org> ghc-6.10.4.ebuild,
+  +files/ghc-6.10.4-ppc64-always-minimal-toc.patch,
+  +files/ghc-6.10.4-propagate-hc-options-to-all-libraries.patch:
+  Add blocker on <haddock-2.4.2. Older versions will not work with this
+  version of ghc. We add the block in ghc rather than in haddock, as blocks
+  can't be trusted to be retroactive.
+
+  Also add ppc64 binary and patches,
+  work done by Sergei Trofimovich <slyfox@community.haskell.org>.
 
   10 Sep 2009; Christian Faulhammer <fauli@gentoo.org> ghc-6.8.2-r1.ebuild:
   stable x86/amd64, bug 283155
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 9e19b0109b09..54af772a2ed0 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -4,6 +4,8 @@ Hash: SHA1
 AUX 10ghc 40 RMD160 1c9e367fa4ea2fa2d3a046986b066b157964390a SHA1 33486a4907e8140f4d919813df4ef4e6203d6b20 SHA256 86c80e876343456b1a1407365bfc2a441bf4c6ca23d3549d67bd800abd617e2f
 AUX depsort.py 1958 RMD160 4192ad9ed14064a9da42ce1faedcf28996094da3 SHA1 2c900abeb6cfcc4327f0e9418b5abd7761ce5879 SHA256 7406f639d17b8acab6a1db7e398e74379b44950d4821bc36901abd3455d63b3d
 AUX ghc-6.10.2-readline.patch 8612 RMD160 cf3c1539a55225439c7f16c698e622c5f6f0cd47 SHA1 82318ea6285fc9dd3ed31a023e0a349a4950473c SHA256 9be6fe23aed177c6dd16fcea4eb9ba39406ee365cb923b33d084dec451005464
+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.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
@@ -30,6 +32,7 @@ DIST ghc-bin-6.10.2-x86.tbz2 53456281 RMD160 78134bc179638c8b9b88c849d6d714efcfe
 DIST ghc-bin-6.10.3-amd64.tbz2 52224187 RMD160 a4cdb7cf8dc3df2a8c2e983ff8edc45ada2403a7 SHA1 9e8855bb64f77dd901ad3ba3502e78030f360c40 SHA256 237719cef511b02511150709ecaa7cc21ed677e788b98221241c2c57c32266e2
 DIST ghc-bin-6.10.3-x86.tbz2 52602522 RMD160 f93d88ac5cabe083249804cfbbe21a80aeb2b124 SHA1 5b8d0ea6479e95d1073794437bb109786277328e SHA256 fc131854e9f1a9f4a3a222b3ba615ae33f6b5d5ae1fec831470ed3fe662da589
 DIST ghc-bin-6.10.4-amd64.tbz2 51566179 RMD160 68b261b4bbef89021a2c92e99c70db45ed85d9e7 SHA1 27e542cc49fa47566c59407fad1c9254d46a8d03 SHA256 2ced87862603a44a59744459a8231f587c0f225f70eb4861ad2db5098c2433a1
+DIST ghc-bin-6.10.4-ppc64.tbz2 67637446 RMD160 ff0bed846e91dcf094142fc6b75f29c9d8521424 SHA1 858406875ade2f1aad8b2ae731bf9ce3fa613f1c SHA256 1ef7d4daf50cc0998651d498d029a5455fb6c410c0abb6a2b23b118ae69e9c54
 DIST ghc-bin-6.10.4-sparc.tbz2 65780774 RMD160 60a431055ce065d2489f2258111e2fb322cd90ec SHA1 bf591efa07e6be805285a800e3832377e303b4f8 SHA256 6ee4d05fb68e622bac960355d928881a2ddd7ce82a10763333e0a8daa93f6d89
 DIST ghc-bin-6.10.4-x86.tbz2 52621494 RMD160 0a0d3aadc20808bb013f4fb6cf8a05145ee679e0 SHA1 0623dad67796306f5088a3bc67d42fc76e2485a7 SHA256 c71589dc7f9866f11a919170dc5e116f50908ac443aff19742c38692e030e98d
 DIST ghc-bin-6.2.2-r1-ppc.tbz2 21018465 RMD160 4dda12e11ce31d395d1085e441171580832003f7 SHA1 0b0f3c5a77612a52317914730c0ecb15bd75d719 SHA256 453babea6a9c3d3382b9987f5e40d184dd3e591a7b1d1f6bd6d41984d94f4dd4
@@ -69,19 +72,19 @@ DIST ghc-testsuite-6.4.2.tar.gz 1181389 RMD160 1eea6a19a9fca6b3d56a6f29b69289cb8
 DIST readline-1.0.1.0.tar.gz 52394 RMD160 6554e24718cc1469e4c19b3e9c7244b527252a7a SHA1 ffcb2569194037c28c6288dbcec75c169c7fa89c SHA256 07f2f039f32bf18838a4875d0f3caa3ed9436dd52b962b2061f0bb8a3316fa1d
 EBUILD ghc-6.10.2.ebuild 11776 RMD160 97c82f512663c2d19e2878b8ba4713a487775def SHA1 ae848ebf3fea760699195ceb5030343fa1117d6a SHA256 6dfe5599d96e81a76053560832ac679b0689c4b4c4d9544393da90312622b351
 EBUILD ghc-6.10.3.ebuild 10580 RMD160 a9483fd501319fda6f373934acc99431858e8de1 SHA1 cce068cdc500b0da08d4381acd992a52847681aa SHA256 f71ac0e5ead8bc620ddb13d5e4fd805e7bb85ee4734b578f14d22708bfbd1fc0
-EBUILD ghc-6.10.4.ebuild 10888 RMD160 bccf2449172e12d527f4e39461e315e26f4638dd SHA1 9b1b7d635c1385d9b107172ddaf60c55bf98e1e1 SHA256 0a8d38b59181e55f21f5e970fb41941e46d27d59a0729a5b31adba5858c8ac55
+EBUILD ghc-6.10.4.ebuild 11015 RMD160 f736ea1117fb62db038f1d4b3370ee36d803c32f SHA1 71f35920921887e010d7a83156a75f0c56372207 SHA256 2a97d8c63a6868c4756cad8d644ab96dd8a9fa6a233cfbcb59e83af0b6f9e601
 EBUILD ghc-6.2.2.ebuild 10387 RMD160 3f30eb547a048ae8a911831d6b6ac04528f7bbcf SHA1 c08282a3a2e60cfb8f742fbb8607ae1819ca3be8 SHA256 201ce669c29ee075e24f03e9abd0510aa172e000e240fadcf89c096004789935
 EBUILD ghc-6.4.2.ebuild 13550 RMD160 54b1dc7fe619e62e168c42ef0135c6554c893834 SHA1 17e5ccc5479c5e387b45379960dd60d5ddbe8774 SHA256 650cc001ea76d20fe6d9deed696491a158ba1144cbb4930b501984c1bc8ab494
 EBUILD ghc-6.6.1.ebuild 12238 RMD160 389782acd6d8ae37e6ffd72fb71667f3c1f04ccb SHA1 8c90cfaa9c7460e8ba9ead1650c76af24cdaa506 SHA256 1e673609fa84ecd8b89159760e7d80351d912e2acbcdb6b3dee1c58f160a5109
 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 28319 RMD160 5a20df0c7c311f8e12c646f893280b8af834075f SHA1 267b7d87aacdf537f2d1dbf9477bd19030ed3ca9 SHA256 5da8bad53570b9384faf7251e44c570f67baf4e098196fae08189ecf0f55be5e
+MISC ChangeLog 28803 RMD160 da8ae5d48a0a07e2bb7c0ce5452b95c5a372613a SHA1 9a8366dcae6c584d103358d15501996e78e92797 SHA256 bbb916b2fb9c51236c45a91f1fd6ea8d593570068a324c3bae68afa21dde9ef9
 MISC metadata.xml 558 RMD160 a6e079bce4a2ff91763d7077e300720ca3d4db2a SHA1 0b52871b0f12c318bed9e7fe7dc994c974096647 SHA256 5e25a5d2ef0e322f55bfbb37955ce388e2ebbaee387b97847ceb844ea3b120fd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqowGgACgkQNQqtfCuFneMQrgCeJo4r+TGdWqIFEy/JiAmjFPm3
-7tYAn2dDK4Ltm1zBJppNKZtk1klG52Nf
-=Ehxa
+iEYEARECAAYFAkqwisAACgkQ1n/CYbXjntJlSACfSVaM0Q9yaG/XxuOktG16eo+8
+KRoAnRZ/Jpov4bp1FXcCalV5qFKO1dyE
+=JTzW
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ghc/files/ghc-6.10.4-ppc64-always-minimal-toc.patch b/dev-lang/ghc/files/ghc-6.10.4-ppc64-always-minimal-toc.patch
new file mode 100644
index 000000000000..8aaf594ee0f9
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-6.10.4-ppc64-always-minimal-toc.patch
@@ -0,0 +1,9 @@
+diff --git a/ghc/ghc.wrapper b/ghc/ghc.wrapper
+index 71eae84..b02421d 100644
+--- a/ghc/ghc.wrapper
++++ b/ghc/ghc.wrapper
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+ 
+-exec $executablename -B$datadir -dynload wrapped ${1+"$@"}
++exec $executablename -B$datadir -optc-mminimal-toc -dynload wrapped ${1+"$@"}
diff --git a/dev-lang/ghc/files/ghc-6.10.4-propagate-hc-options-to-all-libraries.patch b/dev-lang/ghc/files/ghc-6.10.4-propagate-hc-options-to-all-libraries.patch
new file mode 100644
index 000000000000..396c07974d1f
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-6.10.4-propagate-hc-options-to-all-libraries.patch
@@ -0,0 +1,37 @@
+diff --git a/libraries/Makefile b/libraries/Makefile
+index bf59e9a..c85df45 100644
+--- a/libraries/Makefile
++++ b/libraries/Makefile
+@@ -128,7 +128,7 @@ ifeq "$(ghc_ge_605)" "NO"
+ CABAL_GHC_FLAGS += -cpp
+ endif
+ 
+-BOOTSTRAPPING_FLAGS = $(CABAL_GHC_FLAGS) -DCABAL_VERSION=$(CABAL_VERSION) -odir $(HERE_ABS)/bootstrapping -hidir $(HERE_ABS)/bootstrapping -i$(HERE_ABS)/Cabal -i$(HERE_ABS)/filepath -i$(HERE_ABS)/hpc
++BOOTSTRAPPING_FLAGS = $(SRC_HC_OPTS) $(CABAL_GHC_FLAGS) -DCABAL_VERSION=$(CABAL_VERSION) -odir $(HERE_ABS)/bootstrapping -hidir $(HERE_ABS)/bootstrapping -i$(HERE_ABS)/Cabal -i$(HERE_ABS)/filepath -i$(HERE_ABS)/hpc
+ 
+ .PHONY: boot
+ 
+@@ -141,19 +141,19 @@ cabal-bin: cabal-bin.hs
+ bootstrapping.conf: cabal-bin
+ 	echo "[]" > $@.tmp
+ 	-cd extensible-exceptions && $(CABAL) clean     --distpref=dist-bootstrapping
+-	cd extensible-exceptions && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
++	cd extensible-exceptions && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --ghc-options="$(BOOTSTRAPPING_FLAGS)" --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
+ 	cd extensible-exceptions && $(CABAL) build     --distpref=dist-bootstrapping
+ 	cd extensible-exceptions && $(CABAL) install   --distpref=dist-bootstrapping --inplace
+ 	-cd filepath && $(CABAL) clean     --distpref=dist-bootstrapping
+-	cd filepath && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
++	cd filepath && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --ghc-options="$(BOOTSTRAPPING_FLAGS)" --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
+ 	cd filepath && $(CABAL) build     --distpref=dist-bootstrapping
+ 	cd filepath && $(CABAL) install   --distpref=dist-bootstrapping --inplace
+ 	-cd Cabal    && $(CABAL) clean     --distpref=dist-bootstrapping
+-	cd Cabal    && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
++	cd Cabal    && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --ghc-options="$(BOOTSTRAPPING_FLAGS)" --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
+ 	cd Cabal    && $(CABAL) build     --distpref=dist-bootstrapping
+ 	cd Cabal    && $(CABAL) install   --distpref=dist-bootstrapping --inplace
+ 	-cd hpc    && $(CABAL) clean     --distpref=dist-bootstrapping
+-	cd hpc    && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
++	cd hpc    && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --ghc-options="$(BOOTSTRAPPING_FLAGS)" --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
+ 	cd hpc    && $(CABAL) build     --distpref=dist-bootstrapping
+ 	cd hpc    && $(CABAL) install   --distpref=dist-bootstrapping --inplace
+ 	mv $@.tmp $@
diff --git a/dev-lang/ghc/ghc-6.10.4.ebuild b/dev-lang/ghc/ghc-6.10.4.ebuild
index 805c35142287..6044da439881 100644
--- a/dev-lang/ghc/ghc-6.10.4.ebuild
+++ b/dev-lang/ghc/ghc-6.10.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.ebuild,v 1.3 2009/08/02 10:23:12 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.10.4.ebuild,v 1.4 2009/09/16 06:50:28 kolmodin Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -43,6 +43,7 @@ arch_binaries=""
 arch_binaries="$arch_binaries x86?   ( http://code.haskell.org/~ivanm/ghc-bin-${PV}-x86.tbz2 )"
 arch_binaries="$arch_binaries amd64? ( http://haskell.org/~kolmodin/ghc-bin-${PV}-amd64.tbz2 )"
 arch_binaries="$arch_binaries sparc? ( http://haskell.org/~duncan/ghc/ghc-bin-${PV}-sparc.tbz2 )"
+arch_binaries="$arch_binaries ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-${PV}-ppc64.tbz2 )"
 
 #arch_binaries="$arch_binaries alpha?   ( mirror://gentoo/ghc-bin-${PV}-alpha.tbz2 )"
 #arch_binaries="$arch_binaries amd64?   ( mirror://gentoo/ghc-bin-${PV}-amd64.tbz2 )"
@@ -56,7 +57,7 @@ SRC_URI="!binary? ( http://haskell.org/ghc/dist/${EXTRA_SRC_URI}/${P}-src.tar.bz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~sparc ~ppc64 ~x86"
 IUSE="binary doc ghcbootstrap"
 
 RDEPEND="
@@ -64,7 +65,9 @@ RDEPEND="
 	>=sys-devel/gcc-2.95.3
 	>=sys-devel/binutils-2.17
 	>=dev-lang/perl-5.6.1
-	>=dev-libs/gmp-4.1"
+	>=dev-libs/gmp-4.1
+	!<dev-haskell/haddock-2.4.2"
+# earlier versions than 2.4.2 of haddock only works with older ghc releases
 
 DEPEND="${RDEPEND}
 	ghcbootstrap? (	doc? (	~app-text/docbook-xml-dtd-4.2
@@ -124,6 +127,10 @@ ghc_setup_cflags() {
 	gcc-specs-pie && append-ghc-cflags compile link	-nopie
 	gcc-specs-ssp && append-ghc-cflags compile		-fno-stack-protector
 
+	# prevent from failind building unregisterised ghc:
+	# http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html
+	use ppc64 && append-ghc-cflags compile -mminimal-toc
+
 	# We also add -Wa,--noexecstack to get ghc to generate .o files with
 	# non-exectable stack. This it a hack until ghc does it itself properly.
 	append-ghc-cflags assemble		"-Wa,--noexecstack"
@@ -169,6 +176,13 @@ src_unpack() {
 		sed -i -e 's/DO_NOT_INSTALL =/DO_NOT_INSTALL = haddock/' \
 			"${S}/utils/Makefile"
 
+		# Highly useful when you need to pass your HC opts to bootstrap libs
+		# Currently it is needed for ppc64 to build with broken compiler
+		epatch "${FILESDIR}/ghc-6.10.4-propagate-hc-options-to-all-libraries.patch"
+
+		# see ghc_setup_cflags()
+		use ppc64 && epatch "${FILESDIR}/ghc-6.10.4-ppc64-always-minimal-toc.patch"
+
 		# as we have changed the build system with the readline patch
 		eautoreconf
 	fi
@@ -188,20 +202,6 @@ src_compile() {
 		echo "SRC_HC_OPTS+=${GHC_CFLAGS}" >> mk/build.mk
 		echo "SRC_CC_OPTS+=${CFLAGS} -Wa,--noexecstack" >> mk/build.mk
 
-		# The settings that give you the fastest complete GHC build are these:
-		if use ghcquickbuild; then
-			echo "SRC_HC_OPTS     = -H64m -Onot -fasm" >> mk/build.mk
-			echo "GhcStage1HcOpts = -O -fasm" >> mk/build.mk
-			echo "GhcStage2HcOpts = -Onot -fasm" >> mk/build.mk
-			echo "GhcLibHcOpts    = -Onot -fasm" >> mk/build.mk
-			echo "GhcLibWays      =" >> mk/build.mk
-			echo "SplitObjs       = NO" >> mk/build.mk
-		fi
-		# However, note that the libraries are built without optimisation, so
-		# this build isn't very useful. The resulting compiler will be very
-		# slow. On a 4-core x86 machine using MAKEOPTS="-j10", this build was
-		# timed at less than 8 minutes.
-
 		# We can't depend on haddock except when bootstrapping when we
 		# must build docs and include them into the binary .tbz2 package
 		if use ghcbootstrap && use doc; then
@@ -219,6 +219,7 @@ src_compile() {
 
 		# GHC build system knows to build unregisterised on alpha and hppa,
 		# but we have to tell it to build unregisterised on some arches
+		# ppc64: EvilMangler currently does not understand some TOCs
 		if use alpha || use hppa || use ppc64; then
 			echo "GhcUnregisterised=YES" >> mk/build.mk
 			echo "GhcWithInterpreter=NO" >> mk/build.mk