Added ability to bootstrap ghc on systems with gmp-5

To understand why it is supposed to work, please, read comments in dev-lang/ghc/files/ghc-apply-gmp-hack
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 556a0e1d0c658e0133e21c3a6977e92e6ccbc6e8..307fd60a647b4839ce274850e405d491841a7b33 100644 (file)
--- 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.183 2010/07/10 17:59:16 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.184 2010/07/14 09:02:35 slyfox Exp $
+
+  14 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org> ghc-6.2.2.ebuild,
+  ghc-6.4.2.ebuild, ghc-6.6.ebuild, ghc-6.6.1.ebuild, ghc-6.8.2.ebuild,
+  ghc-6.8.2-r1.ebuild, ghc-6.10.4-r1.ebuild, ghc-6.12.1.ebuild,
+  ghc-6.12.3.ebuild, +files/ghc-apply-gmp-hack:
+  Added ability to bootstrap ghc on systems with gmp-5. Thanks to David
+  Brown (davidbCaf at freenode://#gentoo-haskell) for the report.
 
   10 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org> ghc-6.12.3.ebuild,
   +files/ghc-6.12.3-ia64-use-libffi-for-foreign-import-wrapper.patch:

diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 650c1af5d55404a1ab96b345d1d0f65de745a102..9a4c941e276fabc604d90c9f3913b7b96990788d 100644 (file)
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -17,6 +17,7 @@ AUX ghc-6.4.2-sparc32plus.patch 526 RMD160 970d062362284659c2570394c8f9328d8096e
 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
 AUX ghc-6.6-nothreadedrts.patch 665 RMD160 402c8eb78dc648e55d1d7e00c695b49abe0f293d SHA1 8d0bc56096ebe781371dffa668de48a97173cd32 SHA256 bdfb000a70d97bb7341dda5a2ec48bb7f688532ade830eb2d73c7fa6ef1eead1
+AUX ghc-apply-gmp-hack 2563 RMD160 3096051038c98ddae8aacb8f21e69f568534e40c SHA1 57c6024ed12aa351724ac6f21add4cd410b3937a SHA256 b6f6393a63d61d8c2d27bac8b87af197f4b9e0a8ec9873e3c02871ab633d6d2c
 AUX ghc-bash-completion 6496 RMD160 61574aab2f8ed4ae906df5ac291f528384b79b87 SHA1 a0d7c264cc8ff3d235511e151dc82f9e16691bac SHA256 82a862bea2c9248e06fcf74d307de07b05a55f9eb95f412762bd02e53fece822
 AUX ghc-updater 9262 RMD160 10332a0dd2fd2f09e28b250fb74655e67305e2d7 SHA1 c297589995aa6c310bcf61db6fec1df57d5f0eb8 SHA256 e6277b2731c6be5159d28a450ccf9dfe701601f86552096ef8d8c5daedc5929a
 DIST ghc-6.10.4-src.tar.bz2 8060565 RMD160 5f83baf2549f1f4bea140c6a80728c2a76f60ab6 SHA1 0566858b409066d98da70de5adb9a7030d0df5dc SHA256 d66a8e52572f4ff819fe5c4e34c6dd1e84a7763e25c3fadcc222453c0bd8534d
@@ -82,14 +83,14 @@ DIST ghc-bin-6.8.2-x86.tbz2 30872949 RMD160 ce2f9f6fe88440ba3574d85c219e96210d35
 DIST ghc-bundled-readline-5.2_p13-amd64.tbz2 976677 RMD160 f0543aa3f404d45aad4360cc07b777c3aaafc5fb SHA1 1737eae6fe00c4924577e6eb8fa5d2c7eb0b24ca SHA256 f67250899590a551278695bcb7f143c5a6423ea47e5e6966615072cc0f9b51f0
 DIST ghc-bundled-readline-5.2_p13-x86.tbz2 940742 RMD160 5f9470a99047f004bd0917c62253bff9b663c9a5 SHA1 f5463a8929d2ba792b91085f78d6763cb50ef14e SHA256 bb9766235ed0d6e3c2f3ffe1625ecbe8e4d2e0254f7060e845be3a404835cd2a
 DIST ghc-testsuite-6.4.2.tar.gz 1181389 RMD160 1eea6a19a9fca6b3d56a6f29b69289cb88af8173 SHA1 7ada60fe2abb9208d841787781d522d5a1110dc2 SHA256 1a864243e922c233049585fa3bf4a86a0ca3e7b3ffebf26245eb037f15dd4d12
-EBUILD ghc-6.10.4-r1.ebuild 12142 RMD160 1ab046956849ecf53010baead6744b06c15e2ff5 SHA1 ea2528f49fd84380746114b3c9c54c9d558c60b1 SHA256 e4c47b46e19e28d691c3924b3c56a62841337e4cb2fa5c7ab086721a7582c96b
-EBUILD ghc-6.12.1.ebuild 11580 RMD160 f46eb36df08807fd5fb3d2e57eafde0f426c39f2 SHA1 479a43cd181f40cff1419f946e61294a0830302b SHA256 263225b989efd251dd660eefbeff6ca34c1464dc30610d329e6218f68104b2c1
-EBUILD ghc-6.12.3.ebuild 13128 RMD160 029829db54aaa5d040231fdb1f57c987a43f1cad SHA1 91eb307e4c1cda3b58cb4cc06356ad8ad0cef31f SHA256 5f656c6e5659e18100b6dcdd8cae38d6f35961788b2e65f6d3d1506db4696e69
-EBUILD ghc-6.2.2.ebuild 10387 RMD160 3f30eb547a048ae8a911831d6b6ac04528f7bbcf SHA1 c08282a3a2e60cfb8f742fbb8607ae1819ca3be8 SHA256 201ce669c29ee075e24f03e9abd0510aa172e000e240fadcf89c096004789935
-EBUILD ghc-6.4.2.ebuild 13488 RMD160 6aee6876535e79ac3cb3ab8ee3ed8718dd87eb14 SHA1 cff66990f5645f19f58c9dba239a723c1fa03cac SHA256 662fadc150d79ef9d666f76153278ce9a76ebef6f64b5d82a13a53d2c41c8ba5
-EBUILD ghc-6.6.1.ebuild 12113 RMD160 e0913733eb047f13f78bdec1fa202a5c312c2526 SHA1 dd10dda46adae7dadefda6fe5140002d521688f1 SHA256 14e013e3348c8d962776b2ecab2ce6b4a2b1ff0cfbbb007811dfc529df30ca55
-EBUILD ghc-6.6.ebuild 10758 RMD160 bbed00228fd200da1a2eab05b1ceafaaf3e50610 SHA1 d6766e84f761637444950ae0ffdfdba9e5aa6c65 SHA256 3939b0a97602cc8ff2227a6afb9aa785cfd11bbb64ec30849f20b0ba0cd2eb29
-EBUILD ghc-6.8.2-r1.ebuild 8929 RMD160 850372ce4198549dd1b9e3cbc7c8d430ba2b1cb5 SHA1 aa4eaaeebe6195deebc9ddb8db7d69d9eac036d0 SHA256 5ea452a3773b3cacd87ff6a04aa547cec7a9654c57580b9c0de2430a27e479f5
-EBUILD ghc-6.8.2.ebuild 8981 RMD160 85a32ec3ec9ebc1f2651c2a3aa86e374999dca87 SHA1 d01d8503d7668465b5f5d6151145297239e96c76 SHA256 57f147cd2177a1a279d406a0a93f4fac9c7b2c631fe91ab57b3903513de53da7
-MISC ChangeLog 32620 RMD160 4524fda665f8bf35e8ec4aa624934b698682a113 SHA1 951db9caf9e35fb1179350719fc0ed19454818bf SHA256 9cb64403ad3a8b0e3cd0a20d31764db6debd0ef8da9d385dae19129c11bd90ff
+EBUILD ghc-6.10.4-r1.ebuild 12197 RMD160 8dd49bf3e2d898bed796a3b6f02aae7cc3fa8393 SHA1 01dd85aff599f429352e7c09b190f2f4e94df5be SHA256 70ab6f3bea1ae8514db893405f05bce05e1be537b28c26078b6341d5ed723e36
+EBUILD ghc-6.12.1.ebuild 11652 RMD160 be2f744677826a3829f3209a0c4f7aaddc397868 SHA1 4dba47dbd13960d7eb65bc8873f2102c0a62f580 SHA256 1897ff08258c8b47bce02733c020477bcb17e08134c7d3a8d3197943f509c083
+EBUILD ghc-6.12.3.ebuild 13183 RMD160 7e66627bc70d03085981c8600638b8a00433ed76 SHA1 9a96341e6344dcec265c7e69f17084df83973382 SHA256 816cd01a1f4252c60019aeb9e8961a17be7ddae93eb12583f8e06b40d4729ba0
+EBUILD ghc-6.2.2.ebuild 10453 RMD160 8822230d0fbc924eda4df3e417a99fd7e36a032e SHA1 01f6e719cc43b984fbaa2cd347a4689a31c1e127 SHA256 46bbb5f3782f2fed906229b73a525dbffbeec29bfacc68acb14b2937cd662399
+EBUILD ghc-6.4.2.ebuild 13558 RMD160 2bfad1d139edfa46a496f77786fa7ed08f259bba SHA1 cc8c5f23c1e3c9625176bb3783459e094961f9f6 SHA256 a176a28eb009d3d13b908303f277cb39e231d58a5716a18b34125e4eb7951da6
+EBUILD ghc-6.6.1.ebuild 12183 RMD160 3261a2bbff0a47859c5519f4607ebf6cbdd803ab SHA1 a8d456c4c2e8f9cab76f88a4606b0ce7bc334605 SHA256 7af7176e056f15a81bc27584f67afe26e74daabbcec4b37c89f4f509acfcc70f
+EBUILD ghc-6.6.ebuild 10828 RMD160 e39d7ac4869ff11d1f6255f0e3187bdcb8434c46 SHA1 50da32278fc86b1403476bd2a412f2bad95e4332 SHA256 e03181b3fd200bc36b7d1bb5bce1e5e054015e43cceff4a7b8f77d65d5a1921a
+EBUILD ghc-6.8.2-r1.ebuild 8999 RMD160 269a048aee9a25a2ec2322c9460b1686f9059da2 SHA1 3501daab94d39db15a8456b3457058a2662cd473 SHA256 f54b71256cb0778f6b51f2ca0b41fc35d5ae915d50a40ae1d1c4f60442b41c17
+EBUILD ghc-6.8.2.ebuild 9051 RMD160 b107b4ce2fc213b34a75757cfd6271b59af97991 SHA1 1897f1ff55d542abb4429213b23af4510433b3a4 SHA256 4822eb3556100cd5aaa8ba2fbc962467e05d2ed7300e405f2c3aef47052e12de
+MISC ChangeLog 33015 RMD160 45d0c26091e71ef5431f08349bbbb213bfa00fd2 SHA1 d52f313c2bf6e0c297c6b34abec8a17c23556fc3 SHA256 9da0806bbc1d374a2425f3a74f1dda3c207b8380c8070dc234148c4926f73bfc
 MISC metadata.xml 442 RMD160 9cfa0af9084477c8a70ecf0ac3fb3093ae0cd602 SHA1 be2833090f093ac1c8fc2f5c6f3f253bdbdd6b96 SHA256 2bacbdfcaea11289949a687626f59f99af8fda9ec495b2c349ce5898d9f0dcd4

diff --git a/dev-lang/ghc/files/ghc-apply-gmp-hack b/dev-lang/ghc/files/ghc-apply-gmp-hack
new file mode 100644 (file)
index 0000000..a0b4ab8
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-apply-gmp-hack
@@ -0,0 +1,61 @@
+# this script is expected to be sourced by ghc ebuilds built against libgmp.so.3 library
+#
+# > source "${FILESDIR}/ghc-apply-gmp-hack"
+#
+# What it does and why it works:
+#  > GMP 5.0 is upwardly source and binary compatible with 4.x, and 3.x versions,
+#  > except for applications that use the semi-documented mpn_bdivmod  function.
+#
+#  > The solib numbers now reflect the removal of the documented but preliminary
+#  > mpn_bdivmod function; we correctly flag incompatibility with GMP 4.3.
+#  > GMP 5.0.0 has this wrong, and should perhaps be uninstalled to avoid confusion.
+#
+# taken from http://gmplib.org/gmp5.0.html
+#
+# Luckily, ghc does not use the 'mpn_bdivmod' function, so we can easily use
+# libgmp.so.10 for binaries which require libgmp.so.3
+#
+# So, this script checks whether this system has libgmp.so.10 and if has
+# shows it to bootstrapper-compiler via populating LD_LIBRARY_PATH
+# (it actually exports function doing this)
+#
+# After bootstrapping resulting compiler will not depend on old libgmp
+# Newer ghc binaries must be built against newer gmp
+#
+# Blames should be directed to Sergei Trofimovich <slyfox@gentoo.org>
+
+# should be used:
+# > inherit multilib
+# > ...
+# > # somewhere in src_unpack() { # as early as possible, right after unpacking source/binary
+# > source "${FILESDIR}/ghc-apply-gmp-hack" "$(get_libdir)"
+
+local libdir_name=$1
+# let's see if we are in affected system
+if has_version '>=dev-libs/gmp-5.0.1'; then
+       local libgmpso3=$ROOT/usr/$libdir_name/libgmp.so.3
+       local libgmpso10=$ROOT/usr/$libdir_name/libgmp.so.10
+
+       # bother user only if things won't work for him
+       if [[ ! -e "$libgmpso3" ]]; then
+               if use binary; then
+                       eerror "You have requested precompiled binary installation, which is"
+                       eerror "built against 'libgmp.so.3'. You can create compatibility symlink"
+                       eerror "if you have '$libgmpso10' and wish to use installed binary:"
+                       eerror " # ln -s libgmp.so.10 '$libgmpso3'"
+                       die "libgmp.so.3 not found"
+               else
+                       if [[ -e "$libgmpso10" ]]; then
+                               local fake_solib_dir=${S}/fake_solibs
+                               mkdir "$fake_solib_dir" || die "failed to make fake lib dir"
+                               elog "Enabling libgmp hack:"
+                               elog "| Making symlink: '$fake_solib_dir/libgmp.so.3' -> '$libgmpso10'"
+                               ln -s "$libgmpso10" "$fake_solib_dir/libgmp.so.3" || die "failed to make fake symlink"
+                               export LD_LIBRARY_PATH=$fake_solib_dir${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
+                               elog "| setting new LD_LIBRARY_PATH='$LD_LIBRARY_PATH'"
+                       else
+                               eerror "'$libgmpso3' and '$libgmpso10' are not found. Please, report the breakage."
+                       fi
+               fi
+       fi
+fi

diff --git a/dev-lang/ghc/ghc-6.10.4-r1.ebuild b/dev-lang/ghc/ghc-6.10.4-r1.ebuild
index 18f03a040e1bbcdd5a0c3d9b8c26a45e0648ac3a..ff52e3105626298e672c5474d5c93a12a3b5ce07 100644 (file)
--- a/dev-lang/ghc/ghc-6.10.4-r1.ebuild
+++ b/dev-lang/ghc/ghc-6.10.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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-r1.ebuild,v 1.7 2010/07/09 15:03:24 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild,v 1.8 2010/07/14 09:02:35 slyfox Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -28,7 +28,7 @@
 # re-emerge ghc (or ghc-bin). People using vanilla gcc can switch between
 # gcc-3.x and 4.x with no problems.
 
-inherit base autotools bash-completion eutils flag-o-matic toolchain-funcs ghc-package versionator
+inherit base autotools bash-completion eutils flag-o-matic multilib toolchain-funcs ghc-package versionator
 
 DESCRIPTION="The Glasgow Haskell Compiler"
 HOMEPAGE="http://www.haskell.org/ghc/"
@@ -148,6 +148,8 @@ src_unpack() {
        use binary && mkdir "${S}"
 
        base_src_unpack
+       source "${FILESDIR}/ghc-apply-gmp-hack" "$(get_libdir)"
+
        ghc_setup_cflags
 
        if ! use ghcbootstrap; then
@@ -242,7 +244,7 @@ src_compile() {
                # we have to tell it to build unregisterised on some arches
                # ppc64: EvilMangler currently does not understand some TOCs
                # ia64: EvilMangler bitrot
-               if use alpha || use hppa || use ia64 || use ppc64; then
+               if use alpha || use ia64 || use ppc64; then
                        echo "GhcUnregisterised=YES" >> mk/build.mk
                        echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
                        echo "SplitObjs=NO" >> mk/build.mk

diff --git a/dev-lang/ghc/ghc-6.12.1.ebuild b/dev-lang/ghc/ghc-6.12.1.ebuild
index 9629e3d8b706e930a90413406bfabe6c8221c8e6..2a86404dd3c5dd3aa93d89da08dec5cc9a8e107a 100644 (file)
--- a/dev-lang/ghc/ghc-6.12.1.ebuild
+++ b/dev-lang/ghc/ghc-6.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.12.1.ebuild,v 1.4 2010/07/01 20:27:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.12.1.ebuild,v 1.5 2010/07/14 09:02:35 slyfox Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -28,7 +28,7 @@
 # re-emerge ghc (or ghc-bin). People using vanilla gcc can switch between
 # gcc-3.x and 4.x with no problems.
 
-inherit base autotools bash-completion eutils flag-o-matic toolchain-funcs ghc-package versionator
+inherit base autotools bash-completion eutils flag-o-matic multilib toolchain-funcs ghc-package versionator
 
 DESCRIPTION="The Glasgow Haskell Compiler"
 HOMEPAGE="http://www.haskell.org/ghc/"
@@ -40,11 +40,11 @@ EXTRA_SRC_URI="${PV}"
 
 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 ppc?   ( mirror://gentoo/ghc-bin-${PV}-ppc.tbz2 )"
 arch_binaries="$arch_binaries ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-${PV}-ppc64.tbz2 )"
-arch_binaries="$arch_binaries ppc? ( mirror://gentoo/ghc-bin-${PV}-ppc.tbz2 )"
+arch_binaries="$arch_binaries sparc? ( http://haskell.org/~duncan/ghc/ghc-bin-${PV}-sparc.tbz2 )"
+arch_binaries="$arch_binaries x86?   ( http://code.haskell.org/~ivanm/ghc-bin-${PV}-x86.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 )"
@@ -152,6 +152,8 @@ src_unpack() {
        use binary && mkdir "${S}"
 
        base_src_unpack
+       source "${FILESDIR}/ghc-apply-gmp-hack" "$(get_libdir)"
+
        ghc_setup_cflags
 
        if use binary; then

diff --git a/dev-lang/ghc/ghc-6.12.3.ebuild b/dev-lang/ghc/ghc-6.12.3.ebuild
index cde9d5cd0e25cad41629aef982aebb8290f3221d..401d561f66689ac2f3138289a01a8602a7e8c9f1 100644 (file)
--- a/dev-lang/ghc/ghc-6.12.3.ebuild
+++ b/dev-lang/ghc/ghc-6.12.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.12.3.ebuild,v 1.6 2010/07/10 17:59:16 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.12.3.ebuild,v 1.7 2010/07/14 09:02:35 slyfox Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -28,7 +28,7 @@
 # re-emerge ghc (or ghc-bin). People using vanilla gcc can switch between
 # gcc-3.x and 4.x with no problems.
 
-inherit base autotools bash-completion eutils flag-o-matic toolchain-funcs ghc-package versionator
+inherit base autotools bash-completion eutils flag-o-matic multilib toolchain-funcs ghc-package versionator
 
 DESCRIPTION="The Glasgow Haskell Compiler"
 HOMEPAGE="http://www.haskell.org/ghc/"
@@ -141,6 +141,8 @@ src_unpack() {
        use binary && mkdir "${S}"
 
        base_src_unpack
+       source "${FILESDIR}/ghc-apply-gmp-hack" "$(get_libdir)"
+
        ghc_setup_cflags
 
        if ! use ghcbootstrap; then
@@ -256,7 +258,7 @@ src_compile() {
                # we have to tell it to build unregisterised on some arches
                # ppc64: EvilMangler currently does not understand some TOCs
                # ia64: EvilMangler bitrot
-               if use alpha || use hppa || use ia64 || use ppc64; then
+               if use alpha || use ia64 || use ppc64; then
                        echo "GhcUnregisterised=YES" >> mk/build.mk
                        echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
                        echo "SplitObjs=NO" >> mk/build.mk

diff --git a/dev-lang/ghc/ghc-6.2.2.ebuild b/dev-lang/ghc/ghc-6.2.2.ebuild
index f228fe2ad0f615cbd2479240fcc2ab9ea219ea3e..249f4a167c3dc23a5acbcfffad449529a5b70741 100644 (file)
--- a/dev-lang/ghc/ghc-6.2.2.ebuild
+++ b/dev-lang/ghc/ghc-6.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.2.2.ebuild,v 1.27 2008/01/26 19:53:25 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.2.2.ebuild,v 1.28 2010/07/14 09:02:35 slyfox Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -25,7 +25,7 @@
 # re-emerge ghc (or ghc-bin). People using vanilla gcc can switch between
 # gcc-3.x and 4.x with no problems.
 
-inherit base eutils flag-o-matic toolchain-funcs ghc-package
+inherit base eutils flag-o-matic multilib toolchain-funcs ghc-package
 
 DESCRIPTION="The Glasgow Haskell Compiler"
 HOMEPAGE="http://www.haskell.org/ghc/"
@@ -149,6 +149,8 @@ src_unpack() {
        use binary && mkdir "${S}"
 
        base_src_unpack
+       source "${FILESDIR}/ghc-apply-gmp-hack" "$(get_libdir)"
+
        ghc_setup_cflags
 
        if use binary; then

diff --git a/dev-lang/ghc/ghc-6.4.2.ebuild b/dev-lang/ghc/ghc-6.4.2.ebuild
index 05dc7f4a106253a309190215e032b815dd88e7df..bae0d5a2929aadfaf670595ee4c0855f3ff47a51 100644 (file)
--- a/dev-lang/ghc/ghc-6.4.2.ebuild
+++ b/dev-lang/ghc/ghc-6.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.2.ebuild,v 1.28 2010/07/01 20:27:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.2.ebuild,v 1.29 2010/07/14 09:02:35 slyfox Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -25,7 +25,7 @@
 # re-emerge ghc (or ghc-bin). People using vanilla gcc can switch between
 # gcc-3.x and 4.x with no problems.
 
-inherit base eutils flag-o-matic toolchain-funcs autotools ghc-package
+inherit base eutils flag-o-matic multilib toolchain-funcs autotools ghc-package
 
 DESCRIPTION="The Glasgow Haskell Compiler"
 HOMEPAGE="http://www.haskell.org/ghc/"
@@ -172,6 +172,8 @@ src_unpack() {
        use binary && mkdir "${S}"
 
        base_src_unpack
+       source "${FILESDIR}/ghc-apply-gmp-hack" "$(get_libdir)"
+
        ghc_setup_cflags
 
        if use binary; then

diff --git a/dev-lang/ghc/ghc-6.6.1.ebuild b/dev-lang/ghc/ghc-6.6.1.ebuild
index 4873ccd573d407034f9ee90ef03d79ee645b4b87..2a6d3bababb05648e5cc42ec19521154bb3e8a1f 100644 (file)
--- a/dev-lang/ghc/ghc-6.6.1.ebuild
+++ b/dev-lang/ghc/ghc-6.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.6.1.ebuild,v 1.19 2010/07/01 20:27:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.6.1.ebuild,v 1.20 2010/07/14 09:02:35 slyfox Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -25,7 +25,7 @@
 # re-emerge ghc (or ghc-bin). People using vanilla gcc can switch between
 # gcc-3.x and 4.x with no problems.
 
-inherit base bash-completion eutils flag-o-matic toolchain-funcs ghc-package versionator
+inherit base bash-completion eutils flag-o-matic multilib toolchain-funcs ghc-package versionator
 
 DESCRIPTION="The Glasgow Haskell Compiler"
 HOMEPAGE="http://www.haskell.org/ghc/"
@@ -159,6 +159,8 @@ src_unpack() {
        use binary && mkdir "${S}"
 
        base_src_unpack
+       source "${FILESDIR}/ghc-apply-gmp-hack" "$(get_libdir)"
+
        ghc_setup_cflags
 
        if use binary; then

diff --git a/dev-lang/ghc/ghc-6.6.ebuild b/dev-lang/ghc/ghc-6.6.ebuild
index 64a370ccbee5be50825d75e385c9e42663d2e99a..605282b5a81b0f9b5b57c88756f95ce9ec261362 100644 (file)
--- a/dev-lang/ghc/ghc-6.6.ebuild
+++ b/dev-lang/ghc/ghc-6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.6.ebuild,v 1.16 2010/07/01 20:27:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.6.ebuild,v 1.17 2010/07/14 09:02:35 slyfox Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -25,7 +25,7 @@
 # re-emerge ghc (or ghc-bin). People using vanilla gcc can switch between
 # gcc-3.x and 4.x with no problems.
 
-inherit base eutils flag-o-matic toolchain-funcs ghc-package versionator
+inherit base eutils flag-o-matic multilib toolchain-funcs ghc-package versionator
 
 DESCRIPTION="The Glasgow Haskell Compiler"
 HOMEPAGE="http://www.haskell.org/ghc/"
@@ -142,6 +142,8 @@ src_unpack() {
        use binary && mkdir "${S}"
 
        base_src_unpack
+       source "${FILESDIR}/ghc-apply-gmp-hack" "$(get_libdir)"
+
        ghc_setup_cflags
 
        if use binary; then

diff --git a/dev-lang/ghc/ghc-6.8.2-r1.ebuild b/dev-lang/ghc/ghc-6.8.2-r1.ebuild
index 69fd56cbf92ce5b1123511951049fea2baae55db..d6f6bdbe92fe57523762fe2b40f1041cf84690bf 100644 (file)
--- a/dev-lang/ghc/ghc-6.8.2-r1.ebuild
+++ b/dev-lang/ghc/ghc-6.8.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.8.2-r1.ebuild,v 1.3 2010/07/01 20:27:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.8.2-r1.ebuild,v 1.4 2010/07/14 09:02:35 slyfox Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -28,7 +28,7 @@
 # re-emerge ghc (or ghc-bin). People using vanilla gcc can switch between
 # gcc-3.x and 4.x with no problems.
 
-inherit base bash-completion eutils flag-o-matic toolchain-funcs ghc-package versionator
+inherit base bash-completion eutils flag-o-matic multilib toolchain-funcs ghc-package versionator
 
 DESCRIPTION="The Glasgow Haskell Compiler"
 HOMEPAGE="http://www.haskell.org/ghc/"
@@ -137,6 +137,8 @@ pkg_setup() {
 
 src_unpack() {
        base_src_unpack
+       source "${FILESDIR}/ghc-apply-gmp-hack" "$(get_libdir)"
+
        ghc_setup_cflags
 
        # Modify the ghc driver script to use GHC_CFLAGS

diff --git a/dev-lang/ghc/ghc-6.8.2.ebuild b/dev-lang/ghc/ghc-6.8.2.ebuild
index 71a5ec225eb2a4e77a17ef39c549b2d3688dc3df..a58693b4d27656d223c474acaa0f444ee1891642 100644 (file)
--- a/dev-lang/ghc/ghc-6.8.2.ebuild
+++ b/dev-lang/ghc/ghc-6.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.8.2.ebuild,v 1.14 2010/07/01 20:27:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.8.2.ebuild,v 1.15 2010/07/14 09:02:35 slyfox Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -28,7 +28,7 @@
 # re-emerge ghc (or ghc-bin). People using vanilla gcc can switch between
 # gcc-3.x and 4.x with no problems.
 
-inherit base bash-completion eutils flag-o-matic toolchain-funcs ghc-package versionator
+inherit base bash-completion eutils flag-o-matic multilib toolchain-funcs ghc-package versionator
 
 DESCRIPTION="The Glasgow Haskell Compiler"
 HOMEPAGE="http://www.haskell.org/ghc/"
@@ -138,6 +138,8 @@ src_unpack() {
        use binary && mkdir "${S}"
 
        base_src_unpack
+       source "${FILESDIR}/ghc-apply-gmp-hack" "$(get_libdir)"
+
        ghc_setup_cflags
 
        if use binary; then