[Pkg-haskell-commits] darcs: haskell-aeson: Don't build tests threaded on sparc.

[Clint Adams]

Tue Jan 31 15:58:16 UTC 2012  Clint Adams <clint at debian.org>
  * Don't build tests threaded on sparc.
  Ignore-this: 37e819522ee6dc68f4fefe214bef107f

    M ./changelog +7
    M ./patches/series +1
    A ./patches/threaded-option.diff
    M ./rules +1

Tue Jan 31 15:58:16 UTC 2012  Clint Adams <clint at debian.org>
  * Don't build tests threaded on sparc.
  Ignore-this: 37e819522ee6dc68f4fefe214bef107f
diff -rN -u old-haskell-aeson//changelog new-haskell-aeson//changelog
--- old-haskell-aeson//changelog	2012-01-31 15:58:49.327265385 +0000
+++ new-haskell-aeson//changelog	2012-01-31 15:58:49.327265385 +0000
@@ -1,3 +1,10 @@
+haskell-aeson (0.6.0.0-2) unstable; urgency=low
+
+  * Don't build tests threaded on architectures without threaded
+    runtime (sparc).
+
+ -- Clint Adams <clint at debian.org>  Tue, 31 Jan 2012 10:27:36 -0500
+
 haskell-aeson (0.6.0.0-1) unstable; urgency=low
 
   * New upstream version.
diff -rN -u old-haskell-aeson//patches/series new-haskell-aeson//patches/series
--- old-haskell-aeson//patches/series	2012-01-31 15:58:49.327265385 +0000
+++ new-haskell-aeson//patches/series	2012-01-31 15:58:49.331249059 +0000
@@ -1 +1,2 @@
 th-option.diff
+threaded-option.diff
diff -rN -u old-haskell-aeson//patches/threaded-option.diff new-haskell-aeson//patches/threaded-option.diff
--- old-haskell-aeson//patches/threaded-option.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-aeson//patches/threaded-option.diff	2012-01-31 15:58:49.331249059 +0000
@@ -0,0 +1,24 @@
+--- a/aeson.cabal
++++ b/aeson.cabal
+@@ -101,6 +101,10 @@
+   description: build TH bits
+   default: True
+ 
++flag threaded
++  description: build threaded
++  default: True
++
+ library
+   exposed-modules:
+     Data.Aeson
+@@ -152,7 +156,9 @@
+   main-is:        Properties.hs
+ 
+   ghc-options:
+-    -Wall -threaded -rtsopts
++    -Wall -rtsopts
++  if flag(threaded)
++      ghc-options: -threaded
+ 
+   build-depends:
+     QuickCheck,
diff -rN -u old-haskell-aeson//rules new-haskell-aeson//rules
--- old-haskell-aeson//rules	2012-01-31 15:58:49.327265385 +0000
+++ new-haskell-aeson//rules	2012-01-31 15:58:49.331249059 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 DEB_SETUP_GHC_CONFIGURE_ARGS := $(shell test -e /usr/lib/ghc/bin/ghci || echo --flags=-th)
+DEB_SETUP_GHC_CONFIGURE_ARGS += $(shell test -e /usr/lib/ghc-$(GHC_VERSION)/libHSrts_thr.a || echo --flags=-threaded)
 DEB_ENABLE_TESTS = $(shell test -e /usr/lib/ghc/bin/ghci && echo yes)
 
 include /usr/share/cdbs/1/rules/debhelper.mk