| 1 |
slyfox 12/12/26 07:50:42 |
| 2 |
|
| 3 |
Modified: json-0.4.4.ebuild json-0.7.ebuild json-0.5.ebuild |
| 4 |
json-0.4.3.ebuild ChangeLog |
| 5 |
Log: |
| 6 |
Workaround bug #427838 where ghc-6.12.3 hangs building Text.JSON.Parsec by jinleileiking@×××××.com and others. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha149_p11/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.4 dev-haskell/json/json-0.4.4.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/json/json-0.4.4.ebuild?rev=1.4&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/json/json-0.4.4.ebuild?rev=1.4&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/json/json-0.4.4.ebuild?r1=1.3&r2=1.4 |
| 16 |
|
| 17 |
Index: json-0.4.4.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/json/json-0.4.4.ebuild,v |
| 20 |
retrieving revision 1.3 |
| 21 |
retrieving revision 1.4 |
| 22 |
diff -u -r1.3 -r1.4 |
| 23 |
--- json-0.4.4.ebuild 11 Nov 2012 17:56:10 -0000 1.3 |
| 24 |
+++ json-0.4.4.ebuild 26 Dec 2012 07:50:42 -0000 1.4 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2012 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/json/json-0.4.4.ebuild,v 1.3 2012/11/11 17:56:10 slyfox Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/json/json-0.4.4.ebuild,v 1.4 2012/12/26 07:50:42 slyfox Exp $ |
| 30 |
|
| 31 |
# ebuild generated by hackport 0.2.13 |
| 32 |
|
| 33 |
@@ -30,6 +30,8 @@ |
| 34 |
PATCHES=("${FILESDIR}"/${PN}-0.4.3-ghc-7.4.patch) |
| 35 |
|
| 36 |
src_configure() { |
| 37 |
+ [[ $(ghc-version) == "6.12.3" ]] && HCFLAGS+=" -O0" #427838 |
| 38 |
+ |
| 39 |
cabal_src_configure \ |
| 40 |
$(cabal_flag generic) \ |
| 41 |
$(cabal_flag parsec) \ |
| 42 |
|
| 43 |
|
| 44 |
|
| 45 |
1.2 dev-haskell/json/json-0.7.ebuild |
| 46 |
|
| 47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/json/json-0.7.ebuild?rev=1.2&view=markup |
| 48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/json/json-0.7.ebuild?rev=1.2&content-type=text/plain |
| 49 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/json/json-0.7.ebuild?r1=1.1&r2=1.2 |
| 50 |
|
| 51 |
Index: json-0.7.ebuild |
| 52 |
=================================================================== |
| 53 |
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/json/json-0.7.ebuild,v |
| 54 |
retrieving revision 1.1 |
| 55 |
retrieving revision 1.2 |
| 56 |
diff -u -r1.1 -r1.2 |
| 57 |
--- json-0.7.ebuild 18 Nov 2012 14:05:07 -0000 1.1 |
| 58 |
+++ json-0.7.ebuild 26 Dec 2012 07:50:42 -0000 1.2 |
| 59 |
@@ -1,6 +1,6 @@ |
| 60 |
# Copyright 1999-2012 Gentoo Foundation |
| 61 |
# Distributed under the terms of the GNU General Public License v2 |
| 62 |
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/json/json-0.7.ebuild,v 1.1 2012/11/18 14:05:07 gienah Exp $ |
| 63 |
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/json/json-0.7.ebuild,v 1.2 2012/12/26 07:50:42 slyfox Exp $ |
| 64 |
|
| 65 |
EAPI=5 |
| 66 |
|
| 67 |
@@ -27,6 +27,8 @@ |
| 68 |
>=dev-haskell/cabal-1.2.0" |
| 69 |
|
| 70 |
src_configure() { |
| 71 |
+ [[ $(ghc-version) == "6.12.3" ]] && HCFLAGS+=" -O0" #427838 |
| 72 |
+ |
| 73 |
cabal_src_configure \ |
| 74 |
$(cabal_flag generic) \ |
| 75 |
$(cabal_flag parsec) \ |
| 76 |
|
| 77 |
|
| 78 |
|
| 79 |
1.3 dev-haskell/json/json-0.5.ebuild |
| 80 |
|
| 81 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/json/json-0.5.ebuild?rev=1.3&view=markup |
| 82 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/json/json-0.5.ebuild?rev=1.3&content-type=text/plain |
| 83 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/json/json-0.5.ebuild?r1=1.2&r2=1.3 |
| 84 |
|
| 85 |
Index: json-0.5.ebuild |
| 86 |
=================================================================== |
| 87 |
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/json/json-0.5.ebuild,v |
| 88 |
retrieving revision 1.2 |
| 89 |
retrieving revision 1.3 |
| 90 |
diff -u -r1.2 -r1.3 |
| 91 |
--- json-0.5.ebuild 12 Sep 2012 14:57:34 -0000 1.2 |
| 92 |
+++ json-0.5.ebuild 26 Dec 2012 07:50:42 -0000 1.3 |
| 93 |
@@ -1,6 +1,6 @@ |
| 94 |
# Copyright 1999-2012 Gentoo Foundation |
| 95 |
# Distributed under the terms of the GNU General Public License v2 |
| 96 |
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/json/json-0.5.ebuild,v 1.2 2012/09/12 14:57:34 qnikst Exp $ |
| 97 |
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/json/json-0.5.ebuild,v 1.3 2012/12/26 07:50:42 slyfox Exp $ |
| 98 |
|
| 99 |
# ebuild generated by hackport 0.2.13 |
| 100 |
|
| 101 |
@@ -28,6 +28,8 @@ |
| 102 |
>=dev-haskell/cabal-1.2.0" |
| 103 |
|
| 104 |
src_configure() { |
| 105 |
+ [[ $(ghc-version) == "6.12.3" ]] && HCFLAGS+=" -O0" #427838 |
| 106 |
+ |
| 107 |
cabal_src_configure \ |
| 108 |
$(cabal_flag generic) \ |
| 109 |
$(cabal_flag parsec) \ |
| 110 |
|
| 111 |
|
| 112 |
|
| 113 |
1.7 dev-haskell/json/json-0.4.3.ebuild |
| 114 |
|
| 115 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/json/json-0.4.3.ebuild?rev=1.7&view=markup |
| 116 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/json/json-0.4.3.ebuild?rev=1.7&content-type=text/plain |
| 117 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/json/json-0.4.3.ebuild?r1=1.6&r2=1.7 |
| 118 |
|
| 119 |
Index: json-0.4.3.ebuild |
| 120 |
=================================================================== |
| 121 |
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/json/json-0.4.3.ebuild,v |
| 122 |
retrieving revision 1.6 |
| 123 |
retrieving revision 1.7 |
| 124 |
diff -u -r1.6 -r1.7 |
| 125 |
--- json-0.4.3.ebuild 11 Nov 2012 17:56:10 -0000 1.6 |
| 126 |
+++ json-0.4.3.ebuild 26 Dec 2012 07:50:42 -0000 1.7 |
| 127 |
@@ -1,6 +1,6 @@ |
| 128 |
# Copyright 1999-2012 Gentoo Foundation |
| 129 |
# Distributed under the terms of the GNU General Public License v2 |
| 130 |
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/json/json-0.4.3.ebuild,v 1.6 2012/11/11 17:56:10 slyfox Exp $ |
| 131 |
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/json/json-0.4.3.ebuild,v 1.7 2012/12/26 07:50:42 slyfox Exp $ |
| 132 |
|
| 133 |
CABAL_FEATURES="lib profile haddock" |
| 134 |
inherit base haskell-cabal |
| 135 |
@@ -27,3 +27,5 @@ |
| 136 |
DEPEND="${RDEPEND}" |
| 137 |
|
| 138 |
PATCHES=("${FILESDIR}"/${P}-ghc-7.4.patch) |
| 139 |
+ |
| 140 |
+HCFLAGS+=" -O0" #427838 |
| 141 |
|
| 142 |
|
| 143 |
|
| 144 |
1.9 dev-haskell/json/ChangeLog |
| 145 |
|
| 146 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/json/ChangeLog?rev=1.9&view=markup |
| 147 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/json/ChangeLog?rev=1.9&content-type=text/plain |
| 148 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/json/ChangeLog?r1=1.8&r2=1.9 |
| 149 |
|
| 150 |
Index: ChangeLog |
| 151 |
=================================================================== |
| 152 |
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/json/ChangeLog,v |
| 153 |
retrieving revision 1.8 |
| 154 |
retrieving revision 1.9 |
| 155 |
diff -u -r1.8 -r1.9 |
| 156 |
--- ChangeLog 18 Nov 2012 14:05:07 -0000 1.8 |
| 157 |
+++ ChangeLog 26 Dec 2012 07:50:42 -0000 1.9 |
| 158 |
@@ -1,6 +1,11 @@ |
| 159 |
# ChangeLog for dev-haskell/json |
| 160 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 161 |
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/json/ChangeLog,v 1.8 2012/11/18 14:05:07 gienah Exp $ |
| 162 |
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/json/ChangeLog,v 1.9 2012/12/26 07:50:42 slyfox Exp $ |
| 163 |
+ |
| 164 |
+ 26 Dec 2012; Sergei Trofimovich <slyfox@g.o> json-0.4.3.ebuild, |
| 165 |
+ json-0.4.4.ebuild, json-0.5.ebuild, json-0.7.ebuild: |
| 166 |
+ Workaround bug #427838 where ghc-6.12.3 hangs building Text.JSON.Parsec by |
| 167 |
+ jinleileiking@×××××.com and others. |
| 168 |
|
| 169 |
*json-0.7 (18 Nov 2012) |
Archives