diff options
author | 2014-01-19 08:26:34 +0000 | |
---|---|---|
committer | 2014-01-19 08:26:34 +0000 | |
commit | ecd873bb1d69b9406e984d3bb169aae6b743d5e9 (patch) | |
tree | 50101d3d92cdb56e8cc5297792f44e040b191a66 /dev-haskell/vector | |
parent | Add 'ghc-supports-interpreter' helper to detect interpreter support. (diff) | |
download | gentoo-2-ecd873bb1d69b9406e984d3bb169aae6b743d5e9.tar.gz gentoo-2-ecd873bb1d69b9406e984d3bb169aae6b743d5e9.tar.bz2 gentoo-2-ecd873bb1d69b9406e984d3bb169aae6b743d5e9.zip |
Disable constructor specialisation on GHCi-less arches (bug #482960).
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Diffstat (limited to 'dev-haskell/vector')
-rw-r--r-- | dev-haskell/vector/ChangeLog | 8 | ||||
-rw-r--r-- | dev-haskell/vector/vector-0.10.0.1.ebuild | 17 | ||||
-rw-r--r-- | dev-haskell/vector/vector-0.10.9.1.ebuild | 17 | ||||
-rw-r--r-- | dev-haskell/vector/vector-0.9.1.ebuild | 17 |
4 files changed, 51 insertions, 8 deletions
diff --git a/dev-haskell/vector/ChangeLog b/dev-haskell/vector/ChangeLog index 6fab5c1a59a2..ee44482318b6 100644 --- a/dev-haskell/vector/ChangeLog +++ b/dev-haskell/vector/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/vector -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/ChangeLog,v 1.16 2013/10/19 12:53:20 gienah Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/ChangeLog,v 1.17 2014/01/19 08:26:34 slyfox Exp $ + + 19 Jan 2014; Sergei Trofimovich <slyfox@gentoo.org> vector-0.10.0.1.ebuild, + vector-0.10.9.1.ebuild, vector-0.9.1.ebuild: + Disable constructor specialisation on GHCi-less arches (bug #482960). *vector-0.10.9.1 (19 Oct 2013) diff --git a/dev-haskell/vector/vector-0.10.0.1.ebuild b/dev-haskell/vector/vector-0.10.0.1.ebuild index c18ab6a604aa..8b03beccbca9 100644 --- a/dev-haskell/vector/vector-0.10.0.1.ebuild +++ b/dev-haskell/vector/vector-0.10.0.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.10.0.1.ebuild,v 1.4 2013/09/07 20:13:23 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.10.0.1.ebuild,v 1.5 2014/01/19 08:26:34 slyfox Exp $ EAPI=5 @@ -23,3 +23,16 @@ RDEPEND=">=dev-haskell/primitive-0.5.0.1:=[profile?] >=dev-lang/ghc-6.12.3:=" DEPEND="${RDEPEND} >=dev-haskell/cabal-1.2.3" + +src_prepare() { + local can_spec_const="yes" + + ghc-supports-interpreter || can_spec_const="no" + + # ghci-less GHC can't do ANN #482960 + if [[ ${can_spec_const} == "no" ]]; then + einfo "Disabling 'ForceSpecConstr' due to bug #482960" + sed -e 's/{-# ANN type SPEC ForceSpecConstr #-}/{- # ANN type SPEC ForceSpecConstr #-}/' \ + -i Data/Vector/Fusion/Stream/Monadic.hs || die + fi +} diff --git a/dev-haskell/vector/vector-0.10.9.1.ebuild b/dev-haskell/vector/vector-0.10.9.1.ebuild index b67f106496ae..140f53f7955a 100644 --- a/dev-haskell/vector/vector-0.10.9.1.ebuild +++ b/dev-haskell/vector/vector-0.10.9.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.10.9.1.ebuild,v 1.1 2013/10/19 12:53:20 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.10.9.1.ebuild,v 1.2 2014/01/19 08:26:34 slyfox Exp $ EAPI=5 @@ -26,6 +26,19 @@ DEPEND="${RDEPEND} >=dev-haskell/cabal-1.6.0.3 " +src_prepare() { + local can_spec_const="yes" + + ghc-supports-interpreter || can_spec_const="no" + + # ghci-less GHC can't do ANN #482960 + if [[ ${can_spec_const} == "no" ]]; then + einfo "Disabling 'ForceSpecConstr' due to bug #482960" + sed -e 's/{-# ANN type SPEC ForceSpecConstr #-}/{- # ANN type SPEC ForceSpecConstr #-}/' \ + -i Data/Vector/Fusion/Stream/Monadic.hs || die + fi +} + src_configure() { haskell-cabal_src_configure \ $(cabal_flag boundschecks boundschecks) \ diff --git a/dev-haskell/vector/vector-0.9.1.ebuild b/dev-haskell/vector/vector-0.9.1.ebuild index bd8ebc69a661..081597b46754 100644 --- a/dev-haskell/vector/vector-0.9.1.ebuild +++ b/dev-haskell/vector/vector-0.9.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.9.1.ebuild,v 1.8 2012/12/10 21:53:14 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.9.1.ebuild,v 1.9 2014/01/19 08:26:34 slyfox Exp $ # ebuild generated by hackport 0.2.13 @@ -22,3 +22,16 @@ RDEPEND="=dev-haskell/primitive-0.4*[profile?] >=dev-lang/ghc-6.10.1" DEPEND="${RDEPEND} >=dev-haskell/cabal-1.2.3" + +src_prepare() { + local can_spec_const="yes" + + ghc-supports-interpreter || can_spec_const="no" + + # ghci-less GHC can't do ANN #482960 + if [[ ${can_spec_const} == "no" ]]; then + einfo "Disabling 'ForceSpecConstr' due to bug #482960" + sed -e 's/{-# ANN type SPEC ForceSpecConstr #-}/{- # ANN type SPEC ForceSpecConstr #-}/' \ + -i Data/Vector/Fusion/Stream/Monadic.hs || die + fi +} |