diff options
| author |   Mark Wright <gienah@gentoo.org> | 2012-06-02 03:50:52 +0000 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2012-06-02 03:50:52 +0000 |
| commit | fdf2e834b08718d4e2d5ff64e8c98c8e8d7ce403 (patch) | |
| tree | baad7626bb42c7201e4419e0b4a5e75ae7921652 /dev-haskell/regex-pcre-builtin | |
| parent | Stable everywhere. (diff) | |
| download | gentoo-2-fdf2e834b08718d4e2d5ff64e8c98c8e8d7ce403.tar.gz gentoo-2-fdf2e834b08718d4e2d5ff64e8c98c8e8d7ce403.tar.bz2 gentoo-2-fdf2e834b08718d4e2d5ff64e8c98c8e8d7ce403.zip | |
Fix build with ghc 7.5 dev snapshot
(Portage version: 2.1.10.63/cvs/Linux x86_64)
Diffstat (limited to 'dev-haskell/regex-pcre-builtin')
3 files changed, 25 insertions, 6 deletions
diff --git a/dev-haskell/regex-pcre-builtin/ChangeLog b/dev-haskell/regex-pcre-builtin/ChangeLog index e58708a97bf8..a1848247e987 100644 --- a/dev-haskell/regex-pcre-builtin/ChangeLog +++ b/dev-haskell/regex-pcre-builtin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-haskell/regex-pcre-builtin # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/regex-pcre-builtin/ChangeLog,v 1.2 2012/04/07 05:19:59 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/regex-pcre-builtin/ChangeLog,v 1.3 2012/06/02 03:50:52 gienah Exp $ + + 02 Jun 2012; Mark Wright <gienah@gentoo.org> + +files/regex-pcre-builtin-0.94.2.1.7.7-ghc-7.5.patch, + regex-pcre-builtin-0.94.2.1.7.7.ebuild: + Fix build with ghc 7.5 dev snapshot 07 Apr 2012; Mark Wright <gienah@gentoo.org> regex-pcre-builtin-0.94.2.1.7.7.ebuild: diff --git a/dev-haskell/regex-pcre-builtin/files/regex-pcre-builtin-0.94.2.1.7.7-ghc-7.5.patch b/dev-haskell/regex-pcre-builtin/files/regex-pcre-builtin-0.94.2.1.7.7-ghc-7.5.patch new file mode 100644 index 000000000000..f735d3d2083f --- /dev/null +++ b/dev-haskell/regex-pcre-builtin/files/regex-pcre-builtin-0.94.2.1.7.7-ghc-7.5.patch @@ -0,0 +1,12 @@ +--- regex-pcre-builtin-0.94.2.1.7.7-orig/Text/Regex/PCRE/Wrap.hsc 2009-05-21 16:44:47.000000000 +1000 ++++ regex-pcre-builtin-0.94.2.1.7.7/Text/Regex/PCRE/Wrap.hsc 2012-05-19 15:04:34.225820227 +1000 +@@ -90,6 +90,9 @@ + import Text.Regex.Base.RegexLike(RegexOptions(..),RegexMaker(..),RegexContext(..),MatchArray,MatchOffset) + #endif + ++#if (__GLASGOW_HASKELL__>=705) ++import Foreign.C.Types(CInt(..), CSize(..)) ++#endif + + -- | return version of pcre used or Nothing if pcre is not available. + getVersion :: Maybe String diff --git a/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.94.2.1.7.7.ebuild b/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.94.2.1.7.7.ebuild index 060ed5ba30e6..46f3106e09fe 100644 --- a/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.94.2.1.7.7.ebuild +++ b/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.94.2.1.7.7.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.94.2.1.7.7.ebuild,v 1.2 2012/04/07 05:19:59 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.94.2.1.7.7.ebuild,v 1.3 2012/06/02 03:50:52 gienah Exp $ -# ebuild generated by hackport 0.2.13 +EAPI=4 -EAPI="4" +# ebuild generated by hackport 0.2.18.9999 -CABAL_FEATURES="lib profile haddock hscolour hoogle" -inherit haskell-cabal +CABAL_FEATURES="lib profile haddock hoogle hscolour" +inherit base haskell-cabal DESCRIPTION="Replaces/Enhances Text.Regex" HOMEPAGE="http://sourceforge.net/projects/lazy-regex" @@ -22,3 +22,5 @@ RDEPEND=">=dev-haskell/regex-base-0.93[profile?] >=dev-lang/ghc-6.8.2" DEPEND="${RDEPEND} >=dev-haskell/cabal-1.2.3" + +PATCHES=("${FILESDIR}/${PN}-0.94.2.1.7.7-ghc-7.5.patch") |