* [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-7.4.2.ebuild ghc-7.6.2.ebuild ChangeLog
@ 2013-04-14 8:28 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; only message in thread
From: Sergei Trofimovich (slyfox) @ 2013-04-14 8:28 UTC (permalink / raw
To: gentoo-commits
slyfox 13/04/14 08:28:34
Modified: ghc-7.4.2.ebuild ghc-7.6.2.ebuild ChangeLog
Log:
Disabled usage of system's libffi workaround on unregisterised arches (fixes bug #463814 by Agostino Sarubbo). Added USE=gmp (using ineteger-simple restores ia64 support).
(Portage version: 2.2.0_alpha172/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.8 dev-lang/ghc/ghc-7.4.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.4.2.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.4.2.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.4.2.ebuild?r1=1.7&r2=1.8
Index: ghc-7.4.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.2.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ghc-7.4.2.ebuild 28 Mar 2013 22:45:39 -0000 1.7
+++ ghc-7.4.2.ebuild 14 Apr 2013 08:28:34 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.2.ebuild,v 1.7 2013/03/28 22:45:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.2.ebuild,v 1.8 2013/04/14 08:28:34 slyfox Exp $
# Brief explanation of the bootstrap logic:
#
@@ -368,9 +368,18 @@
epatch "${FILESDIR}"/${PN}-7.4.1-darwin-CHOST.patch
epatch "${FILESDIR}"/${PN}-7.2.1-freebsd-CHOST.patch
+ we_want_libffi_workaround() {
+ use ghcmakebinary && return 1
+
+ # pick only registerised arches
+ # http://bugs.gentoo.org/463814
+ use amd64 && return 0
+ use x86 && return 0
+ return 1
+ }
# one mode external depend with unstable ABI be careful to stash it
# avoid external libffi runtime when we build binaries
- use ghcmakebinary || epatch "${FILESDIR}"/${PN}-7.4.2-system-libffi.patch
+ we_want_libffi_workaround && epatch "${FILESDIR}"/${PN}-7.4.2-system-libffi.patch
epatch "${FILESDIR}"/${PN}-7.4.1-ticket-7339-fix-unaligned-unreg.patch
1.2 dev-lang/ghc/ghc-7.6.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.2.ebuild?r1=1.1&r2=1.2
Index: ghc-7.6.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ghc-7.6.2.ebuild 9 Feb 2013 18:33:57 -0000 1.1
+++ ghc-7.6.2.ebuild 14 Apr 2013 08:28:34 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.2.ebuild,v 1.1 2013/02/09 18:33:57 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.2.ebuild,v 1.2 2013/04/14 08:28:34 slyfox Exp $
# Brief explanation of the bootstrap logic:
#
@@ -53,7 +53,7 @@
#arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-alpha.tbz2 )"
#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 ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64.tbz2 )"
#arch_binaries="$arch_binaries ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/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 sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-${PV}-sparc.tbz2 )"
@@ -71,6 +71,7 @@
# return 0
#;;
amd64) return 0 ;;
+ ia64) return 0 ;;
#ppc) return 0 ;;
#ppc64) return 0 ;;
#sparc) return 0 ;;
@@ -84,8 +85,8 @@
LICENSE="BSD"
SLOT="0/${PV}"
# ghc on ia64 needs gcc to support -mcmodel=medium (or some dark hackery) to avoid TOC overflow
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc ghcbootstrap ghcmakebinary llvm"
+KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc ghcbootstrap ghcmakebinary +gmp llvm"
IUSE+=" binary" # don't forget about me later!
IUSE+=" elibc_glibc" # system stuff
@@ -119,6 +120,9 @@
${PDEPEND}
llvm? ( sys-devel/llvm )"
+# ia64 fails to return from STG GMP primitives (stage2 always SIGSEGVs)
+REQUIRED_USE="ia64? ( !gmp )"
+
is_crosscompile() {
[[ ${CHOST} != ${CTARGET} ]]
}
@@ -389,11 +393,21 @@
# epatch "${FILESDIR}"/${PN}-7.4-rc2-macos-prefix-respect-gcc.patch
# epatch "${FILESDIR}"/${PN}-7.2.1-freebsd-CHOST.patch
+ we_want_libffi_workaround() {
+ use ghcmakebinary && return 1
+
+ # pick only registerised arches
+ # http://bugs.gentoo.org/463814
+ use amd64 && return 0
+ use x86 && return 0
+ return 1
+ }
# one mode external depend with unstable ABI be careful to stash it
# avoid external libffi runtime when we build binaries
- use ghcmakebinary || epatch "${FILESDIR}"/${PN}-7.5.20120505-system-libffi.patch
+ we_want_libffi_workaround && epatch "${FILESDIR}"/${PN}-7.5.20120505-system-libffi.patch
epatch "${FILESDIR}"/${PN}-7.4.1-ticket-7339-fix-unaligned-unreg.patch
+ epatch "${FILESDIR}"/${PN}-7.6.2-integer-simple-div-mod.patch
if use prefix; then
# Make configure find docbook-xsl-stylesheets from Prefix
@@ -502,6 +516,12 @@
export PATH="${WORKDIR}/usr/bin:${PATH}"
fi
+ if use gmp; then
+ echo "INTEGER_LIBRARY=integer-gmp" >> mk/build.mk
+ else
+ echo "INTEGER_LIBRARY=integer-simple" >> mk/build.mk
+ fi
+
# Since GHC 6.12.2 the GHC wrappers store which GCC version GHC was
# compiled with, by saving the path to it. The purpose is to make sure
# that GHC will use the very same gcc version when it compiles haskell
1.237 dev-lang/ghc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.237&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.237&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.236&r2=1.237
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- ChangeLog 28 Mar 2013 22:45:39 -0000 1.236
+++ ChangeLog 14 Apr 2013 08:28:34 -0000 1.237
@@ -1,6 +1,13 @@
# ChangeLog for dev-lang/ghc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.236 2013/03/28 22:45:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.237 2013/04/14 08:28:34 slyfox Exp $
+
+ 14 Apr 2013; Sergei Trofimovich <slyfox@gentoo.org>
+ +files/ghc-7.6.2-integer-simple-div-mod.patch, ghc-7.4.2.ebuild,
+ ghc-7.6.2.ebuild:
+ Disabled usage of system's libffi workaround on unregisterised arches (fixes
+ bug #463814 by Agostino Sarubbo). Added USE=gmp (using ineteger-simple
+ restores ia64 support).
28 Mar 2013; Agostino Sarubbo <ago@gentoo.org> ghc-7.4.2.ebuild:
Stable for x86, wrt bug #457780
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-04-14 8:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-14 8:28 [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-7.4.2.ebuild ghc-7.6.2.ebuild ChangeLog Sergei Trofimovich (slyfox)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox