Support building with Debian stable's ghc.
This commit is contained in:
parent
83715949c9
commit
23da029b75
6 changed files with 16 additions and 1 deletions
|
@ -39,6 +39,7 @@ import qualified Annex
|
|||
import Utility
|
||||
import Types
|
||||
import qualified TypeInternals as Internals
|
||||
import Portability
|
||||
|
||||
{- List of backends in the order to try them when storing a new key. -}
|
||||
list :: Annex [Backend]
|
||||
|
|
2
Makefile
2
Makefile
|
@ -2,7 +2,7 @@ all: git-annex docs
|
|||
|
||||
git-annex:
|
||||
mkdir -p build
|
||||
ghc -odir build -hidir build --make git-annex
|
||||
ghc -cpp -odir build -hidir build --make git-annex
|
||||
|
||||
install:
|
||||
install -d $(DESTDIR)/usr/bin
|
||||
|
|
9
Portability.hs
Normal file
9
Portability.hs
Normal 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
|
|
@ -40,6 +40,7 @@ import Locations
|
|||
import UUID
|
||||
import Utility
|
||||
import qualified Core
|
||||
import Portability
|
||||
|
||||
{- Human visible list of remotes. -}
|
||||
list :: [Git.Repo] -> String
|
||||
|
|
1
debian/changelog
vendored
1
debian/changelog
vendored
|
@ -4,6 +4,7 @@ git-annex (0.03) UNRELEASED; urgency=low
|
|||
* Add --verbose
|
||||
* Fix SIGINT handling.
|
||||
* 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
|
||||
|
||||
|
|
|
@ -38,3 +38,6 @@ Thanks for your help!
|
|||
> 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
|
||||
> 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]]
|
||||
|
|
Loading…
Reference in a new issue