[Pkg-haskell-commits] darcs: shelltestrunner: Add threaded runtime disable patch/build rule

[Iustin Pop]

Wed Mar 28 21:56:49 UTC 2012  Iustin Pop <iustin at debian.org>
  * Add threaded runtime disable patch/build rule
  Ignore-this: 23e404bffd14a2b09e6e98f54d00cc75
  
  Based on discussion on debian-haskell mailing list. Patch copied from the
  haskell-aeson package.

    A ./patches/add-threaded-flag.patch
    M ./patches/series +1
    M ./rules +3

Wed Mar 28 21:56:49 UTC 2012  Iustin Pop <iustin at debian.org>
  * Add threaded runtime disable patch/build rule
  Ignore-this: 23e404bffd14a2b09e6e98f54d00cc75
  
  Based on discussion on debian-haskell mailing list. Patch copied from the
  haskell-aeson package.
diff -rN -u old-shelltestrunner//patches/add-threaded-flag.patch new-shelltestrunner//patches/add-threaded-flag.patch
--- old-shelltestrunner//patches/add-threaded-flag.patch	1970-01-01 00:00:00.000000000 +0000
+++ new-shelltestrunner//patches/add-threaded-flag.patch	2012-05-19 19:15:58.618325327 +0000
@@ -0,0 +1,25 @@
+Description: add a controllable -threaded flag
+ This can be used to disable the threaded runtime on platforms where it
+ is missing.
+Forwarded: no
+Author: Iustin Pop <iustin at debian.org>
+Last-Update: 2012-03-28
+--- a/shelltestrunner.cabal
++++ b/shelltestrunner.cabal
+@@ -23,9 +23,15 @@
+ extra-tmp-files:
+ extra-source-files:
+ 
++flag threaded
++  description: build threaded
++  default: True
++
+ executable shelltest
+   main-is:        shelltest.hs
+-  ghc-options:    -threaded -W -fwarn-tabs
++  ghc-options:    -W -fwarn-tabs
++  if flag(threaded)
++      ghc-options: -threaded
+   build-depends:
+                  base                 >= 4     && < 5
+                 ,filemanip            >= 0.3   && < 0.4
diff -rN -u old-shelltestrunner//patches/series new-shelltestrunner//patches/series
--- old-shelltestrunner//patches/series	2012-05-19 19:15:58.582327130 +0000
+++ new-shelltestrunner//patches/series	2012-05-19 19:15:58.634325793 +0000
@@ -1 +1,2 @@
 remove-cabal-th-dependency.patch
+add-threaded-flag.patch
diff -rN -u old-shelltestrunner//rules new-shelltestrunner//rules
--- old-shelltestrunner//rules	2012-05-19 19:15:58.574324907 +0000
+++ new-shelltestrunner//rules	2012-05-19 19:15:58.634325793 +0000
@@ -3,6 +3,9 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
 
+# Disable linking with the threaded runtime if not available
+DEB_SETUP_GHC_CONFIGURE_ARGS += $(shell test -e /usr/lib/ghc-$(GHC_VERSION)/libHSrts_thr.a || echo --flags=-threaded)
+
 build/$(CABAL_PACKAGE) :: build-ghc-stamp
 
 install/$(CABAL_PACKAGE) :: build/$(CABAL_PACKAGE)