[Pkg-haskell-commits] darcs: darcs: Fix FTBFS on arches without ghc -threaded (Closes: #541848).

[Trent W. Buck]

Sun Nov  1 10:26:43 UTC 2009  Trent W. Buck <trentbuck at gmail.com>
  * Fix FTBFS on arches without ghc -threaded (Closes: #541848).
  Ignore-this: 7a28b0d92316636330e2d2bf0271091c

    A ./patches/make-threaded-optional
    M ./patches/series +1
    M ./rules -1 +1

Sun Nov  1 10:26:43 UTC 2009  Trent W. Buck <trentbuck at gmail.com>
  * Fix FTBFS on arches without ghc -threaded (Closes: #541848).
  Ignore-this: 7a28b0d92316636330e2d2bf0271091c
diff -rN -u old-darcs/patches/make-threaded-optional new-darcs/patches/make-threaded-optional
--- old-darcs/patches/make-threaded-optional	1970-01-01 00:00:00.000000000 +0000
+++ new-darcs/patches/make-threaded-optional	2010-03-06 11:45:33.542392507 +0000
@@ -0,0 +1,31 @@
+Sat Oct 31 19:37:17 EST 2009  Trent W. Buck <trentbuck at gmail.com>
+  * Resolve issue1554: allow opt-out of -threaded (fix ARM builds).
+  GHC doesn't support -threaded on some architectures.
+  This patch allows -f-threaded, so Darcs will compile again.
+Index: darcs-2.3.0/darcs.cabal
+===================================================================
+--- darcs-2.3.0.orig/darcs.cabal	2009-11-01 21:19:58.451735608 +1100
++++ darcs-2.3.0/darcs.cabal	2009-11-01 21:20:00.271735867 +1100
+@@ -100,6 +100,10 @@
+ flag terminfo
+   description: Use the terminfo package for enhanced console support.
+ 
++flag threaded
++  description: Use threading and SMP support.
++  default:     True
++
+ flag type-witnesses
+   description: Use GADT type witnesses.
+   default:     False
+@@ -154,8 +158,10 @@
+                     src/Crypt/sha2.c
+ 
+   -- We need optimizations, regardless of what Hackage says
+-  ghc-options:      -Wall -O2 -funbox-strict-fields -threaded
++  ghc-options:      -Wall -O2 -funbox-strict-fields
+   ghc-prof-options: -prof -auto-all
++  if flag(threaded)
++    ghc-options:    -threaded
+ 
+   if !flag(zlib)
+     extra-libraries:  z
diff -rN -u old-darcs/patches/series new-darcs/patches/series
--- old-darcs/patches/series	2010-03-06 11:45:33.538392295 +0000
+++ new-darcs/patches/series	2010-03-06 11:45:33.546392719 +0000
@@ -4,3 +4,4 @@
 no-hspwd
 use-sensible-editor
 manpage-cleanup
+make-threaded-optional
diff -rN -u old-darcs/rules new-darcs/rules
--- old-darcs/rules	2010-03-06 11:45:33.538392295 +0000
+++ new-darcs/rules	2010-03-06 11:45:33.594395266 +0000
@@ -9,7 +9,7 @@
 override_dh_auto_clean: Setup
 	./Setup clean
 override_dh_auto_configure: Setup
-	./Setup configure --prefix=/usr -fcurl-pipelining --constraint=parsec\<3
+	./Setup configure --prefix=/usr -fcurl-pipelining --constraint=parsec\<3 $(if $(wildcard /usr/lib/*/libHSrts_thr.a),,-f-threaded)
 override_dh_auto_install: Setup
 	./Setup copy --destdir=$(CURDIR)/debian/darcs
 override_dh_auto_test: Setup