diff options
| author |   Joseph Jezak <josejx@gentoo.org> | 2011-12-28 08:47:34 +0000 |
|---|---|---|
| committer | Joseph Jezak <josejx@gentoo.org> | 2011-12-28 08:47:34 +0000 |
| commit | d218f631a99a0a1ecd926dd850a47270749c7cbd (patch) | |
| tree | f7a1b76ff93b5f54737cf21be4a51f2584d0bafb /dev-lang | |
| parent | Revision bump to drop ruby19 from stable version. (diff) | |
| download | gentoo-2-d218f631a99a0a1ecd926dd850a47270749c7cbd.tar.gz gentoo-2-d218f631a99a0a1ecd926dd850a47270749c7cbd.tar.bz2 gentoo-2-d218f631a99a0a1ecd926dd850a47270749c7cbd.zip | |
Added patch for compilation on ppc32 and added binary build.
(Portage version: 2.1.10.43/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/ghc/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/ghc/files/ghc-7.0.4-fix-ppc-linker.patch | 23 | ||||
| -rw-r--r-- | dev-lang/ghc/ghc-7.0.4.ebuild | 8 |
3 files changed, 34 insertions, 3 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/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 |