Support building with Debian stable's ghc.

This commit is contained in:
Joey Hess 2010-10-30 15:10:10 -04:00
parent 83715949c9
commit 23da029b75
6 changed files with 16 additions and 1 deletions

View file

@ -39,6 +39,7 @@ import qualified Annex
import Utility import Utility
import Types import Types
import qualified TypeInternals as Internals import qualified TypeInternals as Internals
import Portability
{- List of backends in the order to try them when storing a new key. -} {- List of backends in the order to try them when storing a new key. -}
list :: Annex [Backend] list :: Annex [Backend]

View file

@ -2,7 +2,7 @@ all: git-annex docs
git-annex: git-annex:
mkdir -p build mkdir -p build
ghc -odir build -hidir build --make git-annex ghc -cpp -odir build -hidir build --make git-annex
install: install:
install -d $(DESTDIR)/usr/bin install -d $(DESTDIR)/usr/bin

9
Portability.hs Normal file
View file

@ -0,0 +1,9 @@
{- git-annex - Nasty portability workarounds. -}
module Portability where
-- old ghc does not know about SomeException.
-- http://haskell.1045720.n5.nabble.com/Help-using-catch-in-6-10-td3127921.html#a3127921
-- This needs ghc -cpp
#if __GLASGOW_HASKELL__ < 610
type SomeException = Exception
#endif

View file

@ -40,6 +40,7 @@ import Locations
import UUID import UUID
import Utility import Utility
import qualified Core import qualified Core
import Portability
{- Human visible list of remotes. -} {- Human visible list of remotes. -}
list :: [Git.Repo] -> String list :: [Git.Repo] -> String

1
debian/changelog vendored
View file

@ -4,6 +4,7 @@ git-annex (0.03) UNRELEASED; urgency=low
* Add --verbose * Add --verbose
* Fix SIGINT handling. * Fix SIGINT handling.
* Fix handling of files with unusual characters in their name. * Fix handling of files with unusual characters in their name.
* Support building with Debian stable's ghc.
-- Joey Hess <joeyh@debian.org> Thu, 28 Oct 2010 13:46:59 -0400 -- Joey Hess <joeyh@debian.org> Thu, 28 Oct 2010 13:46:59 -0400

View file

@ -38,3 +38,6 @@ Thanks for your help!
> Newer versions of ghc changed their exception handling types, and > Newer versions of ghc changed their exception handling types, and
> I coded git-annex to use the new style and not the old. gch6 6.12 will > I coded git-annex to use the new style and not the old. gch6 6.12 will
> work. I do not think there is a backport available though. --[[Joey]] > work. I do not think there is a backport available though. --[[Joey]]
>
> Ok, found and deployed a workaround. It is not tested. Let me know how it
> works for you. --[[Joey]]