Gentoo Archives: gentoo-commits

From: "Sergei Trofimovich (slyfox)" <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-7.4.2.ebuild ChangeLog
Date: Tue, 26 Mar 2013 20:19:21
Message-Id: 20130326201918.466892171D@flycatcher.gentoo.org
1 slyfox 13/03/26 20:19:18
2
3 Modified: ghc-7.4.2.ebuild ChangeLog
4 Log:
5 Add ia64 binary.
6
7 (Portage version: 2.2.0_alpha166_p29/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
8
9 Revision Changes Path
10 1.3 dev-lang/ghc/ghc-7.4.2.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.4.2.ebuild?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.4.2.ebuild?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.4.2.ebuild?r1=1.2&r2=1.3
15
16 Index: ghc-7.4.2.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.2.ebuild,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- ghc-7.4.2.ebuild 13 Feb 2013 21:46:44 -0000 1.2
23 +++ ghc-7.4.2.ebuild 26 Mar 2013 20:19:18 -0000 1.3
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2013 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.2.ebuild,v 1.2 2013/02/13 21:46:44 slyfox Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.2.ebuild,v 1.3 2013/03/26 20:19:18 slyfox Exp $
29
30 # Brief explanation of the bootstrap logic:
31 #
32 @@ -42,7 +42,7 @@
33 arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-alpha.tbz2 )"
34 #arch_binaries="$arch_binaries arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-${PV}-arm.tbz2 )"
35 arch_binaries="$arch_binaries amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-${PV}-amd64-stable-glibc.tbz2 )"
36 -#arch_binaries="$arch_binaries ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
37 +arch_binaries="$arch_binaries ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64.tbz2 )"
38 arch_binaries="$arch_binaries ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-${PV}-ppc.tbz2 )"
39 arch_binaries="$arch_binaries ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-${PV}-ppc64.tbz2 )"
40 arch_binaries="$arch_binaries sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-${PV}-sparc.tbz2 )"
41 @@ -60,6 +60,7 @@
42 # return 0
43 #;;
44 amd64) return 0 ;;
45 + ia64) return 0 ;;
46 ppc) return 0 ;;
47 ppc64) return 0 ;;
48 sparc) return 0 ;;
49 @@ -73,8 +74,8 @@
50 LICENSE="BSD"
51 SLOT="0/${PV}"
52 # ghc on ia64 needs gcc to support -mcmodel=medium (or some dark hackery) to avoid TOC overflow
53 -KEYWORDS="~alpha ~amd64 -ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
54 -IUSE="doc ghcbootstrap ghcmakebinary llvm"
55 +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
56 +IUSE="doc ghcbootstrap ghcmakebinary +gmp llvm"
57 IUSE+=" binary" # don't forget about me later!
58 IUSE+=" elibc_glibc" # system stuff
59
60 @@ -108,6 +109,9 @@
61 ${PDEPEND}
62 llvm? ( sys-devel/llvm )"
63
64 +# ia64 fails to return from STG GMP primitives (stage2 always SIGSEGVs)
65 +REQUIRED_USE="ia64? ( !gmp )"
66 +
67 append-ghc-cflags() {
68 local flag compile assemble link
69 for flag in $*; do
70 @@ -468,6 +472,12 @@
71 export PATH="${WORKDIR}/usr/bin:${PATH}"
72 fi
73
74 + if use gmp; then
75 + echo "INTEGER_LIBRARY=integer-gmp" >> mk/build.mk
76 + else
77 + echo "INTEGER_LIBRARY=integer-simple" >> mk/build.mk
78 + fi
79 +
80 # Since GHC 6.12.2 the GHC wrappers store which GCC version GHC was
81 # compiled with, by saving the path to it. The purpose is to make sure
82 # that GHC will use the very same gcc version when it compiles haskell
83
84
85
86 1.232 dev-lang/ghc/ChangeLog
87
88 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.232&view=markup
89 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.232&content-type=text/plain
90 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.231&r2=1.232
91
92 Index: ChangeLog
93 ===================================================================
94 RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
95 retrieving revision 1.231
96 retrieving revision 1.232
97 diff -u -r1.231 -r1.232
98 --- ChangeLog 13 Feb 2013 21:46:44 -0000 1.231
99 +++ ChangeLog 26 Mar 2013 20:19:18 -0000 1.232
100 @@ -1,6 +1,9 @@
101 # ChangeLog for dev-lang/ghc
102 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
103 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.231 2013/02/13 21:46:44 slyfox Exp $
104 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.232 2013/03/26 20:19:18 slyfox Exp $
105 +
106 + 26 Mar 2013; Sergei Trofimovich <slyfox@g.o> ghc-7.4.2.ebuild:
107 + Add ia64 binary.
108
109 13 Feb 2013; Sergei Trofimovich <slyfox@g.o>
110 +files/terminfo-0.3.2.5-tinfo.patch, ghc-7.4.2.ebuild: