[Pkg-haskell-commits] darcs: haskell-leksah-server: Fix "haskell-leksah-server - FTBFS: cannot find -lHSrts_thr" by also consider the flag when building leksahecho. (Closes: #594070)

[Marco Túlio Gontijo e Silva]

Mon Aug 23 13:42:28 UTC 2010  Marco T[_\c3_][_\ba_]lio Gontijo e Silva <marcot at marcot.eti.br>
  * Fix "haskell-leksah-server - FTBFS: cannot find -lHSrts_thr" by also consider the flag when building leksahecho. (Closes: #594070)
  Ignore-this: 8b47938ec89f898bc64e8f062cf68ce0

    M ./changelog +7
    M ./patches/threaded_flag.cabal -2 +18

Mon Aug 23 13:42:28 UTC 2010  Marco Túlio Gontijo e Silva <marcot at marcot.eti.br>
  * Fix "haskell-leksah-server - FTBFS: cannot find -lHSrts_thr" by also consider the flag when building leksahecho. (Closes: #594070)
  Ignore-this: 8b47938ec89f898bc64e8f062cf68ce0
diff -rN -u old-haskell-leksah-server/changelog new-haskell-leksah-server/changelog
--- old-haskell-leksah-server/changelog	2010-08-23 16:08:44.427295482 +0000
+++ new-haskell-leksah-server/changelog	2010-08-23 16:08:44.435295910 +0000
@@ -1,3 +1,10 @@
+haskell-leksah-server (0.8.0.6-3) UNRELEASED; urgency=low
+
+  * Fix "haskell-leksah-server - FTBFS: cannot find -lHSrts_thr"
+    by also consider the flag when building leksahecho. (Closes: #594070)
+
+ -- Marco Túlio Gontijo e Silva <marcot at debian.org>  Mon, 23 Aug 2010 10:41:48 -0300
+
 haskell-leksah-server (0.8.0.6-2) unstable; urgency=low
 
   * Fix "FTBFS [!x86]: /usr/bin/ld: cannot find -lHSrts_thr" by creating
diff -rN -u old-haskell-leksah-server/patches/threaded_flag.cabal new-haskell-leksah-server/patches/threaded_flag.cabal
--- old-haskell-leksah-server/patches/threaded_flag.cabal	2010-08-23 16:08:44.427295482 +0000
+++ new-haskell-leksah-server/patches/threaded_flag.cabal	2010-08-23 16:08:44.427295482 +0000
@@ -1,7 +1,7 @@
 Index: haskell-leksah-server-0.8.0.6/leksah-server.cabal
 ===================================================================
---- haskell-leksah-server-0.8.0.6.orig/leksah-server.cabal	2010-08-23 07:47:18.000000000 -0300
-+++ haskell-leksah-server-0.8.0.6/leksah-server.cabal	2010-08-23 07:51:20.000000000 -0300
+--- haskell-leksah-server-0.8.0.6.orig/leksah-server.cabal	2010-08-23 08:00:19.000000000 -0300
++++ haskell-leksah-server-0.8.0.6/leksah-server.cabal	2010-08-23 10:39:32.000000000 -0300
 @@ -26,6 +26,10 @@
      Default: False
      Description: Use libcurl instead of running wget
@@ -31,3 +31,19 @@
      ghc-prof-options: -auto-all -prof
  
      -- Bundled leksah-process
+@@ -132,10 +140,13 @@
+     hs-source-dirs: src
+     ghc-prof-options: -auto-all -prof
+     ghc-shared-options: -auto-all -prof
++    if flag(threaded)
++        ghc-options: -threaded
++
+     if (impl(ghc >= 6.12))
+-       ghc-options: -Wall -fno-warn-unused-do-bind -ferror-spans -threaded -O2
++       ghc-options: -Wall -fno-warn-unused-do-bind -ferror-spans -O2
+     else
+-       ghc-options: -Wall -ferror-spans -threaded -O2
++       ghc-options: -Wall -ferror-spans -O2
+ 
+     -- Bundled leksah-process
+     c-sources: