[Pkg-haskell-commits] darcs: haskell-llvm-base: Avoid Template Haskell in Setup.hs (Closes: 742750)

[Joachim Breitner]

Sat Mar 29 16:20:38 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Avoid Template Haskell in Setup.hs (Closes: 742750)

    M ./changelog -1 +7
    A ./patches/
    A ./patches/no-th-in-setup
    A ./patches/series

Sat Mar 29 16:20:38 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Avoid Template Haskell in Setup.hs (Closes: 742750)
diff -rN -u old-haskell-llvm-base/changelog new-haskell-llvm-base/changelog
--- old-haskell-llvm-base/changelog	2014-03-29 16:20:51.923193343 +0000
+++ new-haskell-llvm-base/changelog	2014-03-29 16:20:51.927193342 +0000
@@ -1,7 +1,13 @@
+haskell-llvm-base (3.2.0.2-2) UNRELEASED; urgency=medium
+
+  * Avoid Template Haskell in Setup.hs (Closes: 742750)
+
+ -- Joachim Breitner <nomeata at debian.org>  Sat, 29 Mar 2014 17:20:12 +0100
+
 haskell-llvm-base (3.2.0.2-1) unstable; urgency=medium
 
   * New upstream release
-  * Depend on fixed haskell-devscripts (Closes: #741780) 
+  * Depend on fixed haskell-devscripts (Closes: #741780)
 
  -- Joachim Breitner <nomeata at debian.org>  Sun, 16 Mar 2014 15:21:06 +0100
 
diff -rN -u old-haskell-llvm-base/patches/no-th-in-setup new-haskell-llvm-base/patches/no-th-in-setup
--- old-haskell-llvm-base/patches/no-th-in-setup	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-llvm-base/patches/no-th-in-setup	2014-03-29 16:20:51.931193341 +0000
@@ -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 -rN -u old-haskell-llvm-base/patches/series new-haskell-llvm-base/patches/series
--- old-haskell-llvm-base/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-llvm-base/patches/series	2014-03-29 16:20:51.931193341 +0000
@@ -0,0 +1 @@
+no-th-in-setup