diff options
| author | Joachim Breitner <mail@joachim-breitner.de> | 2014-03-29 20:20:38 +0400 |
|---|---|---|
| committer | Joachim Breitner <mail@joachim-breitner.de> | 2014-03-29 20:20:38 +0400 |
| commit | 5be6521b300499a5bc2f29003b0e7564ffe318d2 (patch) | |
| tree | d2b6622127609ff0fa46b6397a58df909248f33c | |
| parent | 4bb6dd5ec92fabfefc47b61fe5e49783a76a4689 (diff) | |
| download | DHG_packages-5be6521b300499a5bc2f29003b0e7564ffe318d2.tar.gz | |
haskell-llvm-base: Avoid Template Haskell in Setup.hs (Closes: 742750)
| -rw-r--r-- | p/haskell-llvm-base/debian/changelog | 6 | ||||
| -rw-r--r-- | p/haskell-llvm-base/debian/patches/no-th-in-setup | 42 | ||||
| -rw-r--r-- | p/haskell-llvm-base/debian/patches/series | 1 |
3 files changed, 49 insertions, 0 deletions
diff --git a/p/haskell-llvm-base/debian/changelog b/p/haskell-llvm-base/debian/changelog index 1e45985cc..a2c4a6871 100644 --- a/p/haskell-llvm-base/debian/changelog +++ b/p/haskell-llvm-base/debian/changelog @@ -1,3 +1,9 @@ +haskell-llvm-base (3.2.0.2-2) UNRELEASED; urgency=medium + + * Avoid Template Haskell in Setup.hs (Closes: 742750) + + -- Joachim Breitner <nomeata@debian.org> Sat, 29 Mar 2014 17:20:12 +0100 + haskell-llvm-base (3.2.0.2-1) unstable; urgency=medium * New upstream release diff --git a/p/haskell-llvm-base/debian/patches/no-th-in-setup b/p/haskell-llvm-base/debian/patches/no-th-in-setup new file mode 100644 index 000000000..f939dec21 --- /dev/null +++ b/p/haskell-llvm-base/debian/patches/no-th-in-setup @@ -0,0 +1,42 @@ +This replaces some conditional template haskell by static code. Replace by the +other variant we we start shipping Cabal-1.17 + + +Index: haskell-llvm-base-3.2.0.2/Setup.hs +=================================================================== +--- haskell-llvm-base-3.2.0.2.orig/Setup.hs 2013-05-28 02:38:14.000000000 +0200 ++++ haskell-llvm-base-3.2.0.2/Setup.hs 2014-03-29 17:19:03.463550263 +0100 +@@ -1,7 +1,5 @@ + {-# LANGUAGE CPP #-} + {-# LANGUAGE PatternGuards #-} +-{-# LANGUAGE TemplateHaskell #-} +-{-# LANGUAGE QuasiQuotes #-} + import System.Directory + import System.Environment + import System.FilePath +@@ -19,7 +17,6 @@ + import Distribution.Simple.Register + import Distribution.Simple.Utils + import Distribution.Text ( display ) +-import Language.Haskell.TH + + main = do + let hooks = autoconfUserHooks { postConf = if os == "mingw32" +@@ -103,7 +100,8 @@ + -} + + --- horrible hack to support cabal versions both above and below 1.17 +-extractCLBI x= ++extractCLBI x = let LocalBuildInfo { libraryConfig = Just clbi } = x in clbi ++{- + $(if cabalVersion >= Version [1,17,0] [] + then appE (appE ( varE $ mkName "getComponentLocalBuildInfo") ( varE 'x) ) (conE ( mkName "CLibName")) + +@@ -114,6 +112,7 @@ + (conP (mkName "Just") [varP $ mkName "clbi"] ) ] ) + (normalB $ varE 'x) [] ] + (varE $ mkName "clbi") ) ++-} + + register' :: PackageDescription -> LocalBuildInfo + -> RegisterFlags -- ^Install in the user's database?; verbose diff --git a/p/haskell-llvm-base/debian/patches/series b/p/haskell-llvm-base/debian/patches/series new file mode 100644 index 000000000..6db88e6c5 --- /dev/null +++ b/p/haskell-llvm-base/debian/patches/series @@ -0,0 +1 @@ +no-th-in-setup |