[Pkg-haskell-commits] darcs: haskell-leksah-server: Fix "FTBFS [!x86]: /usr/bin/ld: cannot find -lHSrts_thr" by creating the threaded flag. Thanks for Hamish Mackenzie<hamish.k.mackenzie at googlemail.com> for the patch in upstream. (Closes: #592822)

[Marco Túlio Gontijo e Silva]

Mon Aug 23 10:59:17 UTC 2010  Marco T[_\c3_][_\ba_]lio Gontijo e Silva <marcot at marcot.eti.br>
  * Fix "FTBFS [!x86]: /usr/bin/ld: cannot find -lHSrts_thr" by creating the threaded flag.  Thanks for Hamish Mackenzie <hamish.k.mackenzie at googlemail.com> for the patch in upstream. (Closes: #592822)
  Ignore-this: 6b9029814472e5cdf3a2c44af59b8e4c

    M ./changelog +9
    M ./patches/series +1
    A ./patches/threaded_flag.cabal
    M ./rules +3

Mon Aug 23 10:59:17 UTC 2010  Marco Túlio Gontijo e Silva <marcot at marcot.eti.br>
  * Fix "FTBFS [!x86]: /usr/bin/ld: cannot find -lHSrts_thr" by creating the threaded flag.  Thanks for Hamish Mackenzie <hamish.k.mackenzie at googlemail.com> for the patch in upstream. (Closes: #592822)
  Ignore-this: 6b9029814472e5cdf3a2c44af59b8e4c
diff -rN -u old-haskell-leksah-server/changelog new-haskell-leksah-server/changelog
--- old-haskell-leksah-server/changelog	2010-08-23 12:09:07.176342461 +0000
+++ new-haskell-leksah-server/changelog	2010-08-23 12:09:07.184342884 +0000
@@ -1,3 +1,12 @@
+haskell-leksah-server (0.8.0.6-2) UNRELEASED; urgency=low
+
+  * Fix "FTBFS [!x86]: /usr/bin/ld: cannot find -lHSrts_thr" by creating
+    the threaded flag.  Thanks for Hamish Mackenzie
+    <hamish.k.mackenzie at googlemail.com> for the patch in
+    upstream. (Closes: #592822)
+
+ -- Marco Túlio Gontijo e Silva <marcot at debian.org>  Mon, 23 Aug 2010 07:58:34 -0300
+
 haskell-leksah-server (0.8.0.6-1) unstable; urgency=low
 
   * Initial release. (Closes: #574693)
diff -rN -u old-haskell-leksah-server/patches/series new-haskell-leksah-server/patches/series
--- old-haskell-leksah-server/patches/series	2010-08-23 12:09:07.176342461 +0000
+++ new-haskell-leksah-server/patches/series	2010-08-23 12:09:07.180342672 +0000
@@ -1 +1,2 @@
 use_bundled_leksah-process.patch
+threaded_flag.cabal
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	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-leksah-server/patches/threaded_flag.cabal	2010-08-23 12:09:07.176342461 +0000
@@ -0,0 +1,33 @@
+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
+@@ -26,6 +26,10 @@
+     Default: False
+     Description: Use libcurl instead of running wget
+ 
++flag threaded
++    default: True
++    description: Build with support for multithreaded execution
++
+ library
+     build-depends: Cabal >=1.6.0.1, base >= 4.0.0.0 && <= 5, binary >=0.5.0.0,
+                binary-shared >=0.8, bytestring >=0.9.0.1, containers >=0.2.0.0,
+@@ -112,10 +116,14 @@
+         IDE.Metainfo.WorkspaceCollector IDE.Metainfo.InterfaceCollector
+         IDE.Metainfo.SourceCollectorH IDE.Metainfo.SourceDB IDE.Utils.Tool
+         IDE.HeaderParser IDE.Metainfo.PackageCollector
+-    if (impl(ghc >= 6.12))
+-       ghc-options: -Wall -fno-warn-unused-do-bind -ferror-spans -threaded -O2
++
++    if flag(threaded)
++        ghc-options: -threaded
++
++    if impl(ghc >= 6.12)
++        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
+     ghc-prof-options: -auto-all -prof
+ 
+     -- Bundled leksah-process
diff -rN -u old-haskell-leksah-server/rules new-haskell-leksah-server/rules
--- old-haskell-leksah-server/rules	2010-08-23 12:09:07.176342461 +0000
+++ new-haskell-leksah-server/rules	2010-08-23 12:09:07.180342672 +0000
@@ -4,3 +4,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
+
+# If no threaded RTS is found, disable it
+DEB_SETUP_GHC6_CONFIGURE_ARGS := $(shell test -e /usr/lib/ghc-$(GHC6_VERSION)/libHSrts_thr.a || echo --flags=-threaded)