[Pkg-haskell-commits] darcs: haskell-quickcheck: Test for Template Haskell by testing for the existence of /usr/lib/ghc/bin/ghci, rather than by hardcoding an architecture list. This should enable Test.QuickCheck.All on powerpc and sparc.

[Colin Watson]

Sun Aug 10 12:26:46 UTC 2014  Colin Watson <cjwatson at debian.org>
  * Test for Template Haskell by testing for the existence of /usr/lib/ghc/bin/ghci, rather than by hardcoding an architecture list. This should enable Test.QuickCheck.All on powerpc and sparc.

    M ./changelog +8
    M ./control -1
    M ./rules -3 +1

Sun Aug 10 12:26:46 UTC 2014  Colin Watson <cjwatson at debian.org>
  * Test for Template Haskell by testing for the existence of /usr/lib/ghc/bin/ghci, rather than by hardcoding an architecture list. This should enable Test.QuickCheck.All on powerpc and sparc.
diff -rN -u old-haskell-quickcheck/changelog new-haskell-quickcheck/changelog
--- old-haskell-quickcheck/changelog	2014-08-10 12:46:58.267755486 +0000
+++ new-haskell-quickcheck/changelog	2014-08-10 12:46:58.275755493 +0000
@@ -1,3 +1,11 @@
+haskell-quickcheck (2.7.6-3) UNRELEASED; urgency=medium
+
+  * Test for Template Haskell by testing for the existence of
+    /usr/lib/ghc/bin/ghci, rather than by hardcoding an architecture list.
+    This should enable Test.QuickCheck.All on powerpc and sparc.
+
+ -- Colin Watson <cjwatson at debian.org>  Sun, 10 Aug 2014 13:24:42 +0100
+
 haskell-quickcheck (2.7.6-2) unstable; urgency=medium
 
   * Disable tests when templateHaskell is not available 
diff -rN -u old-haskell-quickcheck/control new-haskell-quickcheck/control
--- old-haskell-quickcheck/control	2014-08-10 12:46:58.267755486 +0000
+++ new-haskell-quickcheck/control	2014-08-10 12:46:58.271755490 +0000
@@ -8,7 +8,6 @@
                ghc (>= 6.10.4),
                ghc-prof,
                ghc-doc,
-               ghc-ghci [any-i386 any-amd64],
                haskell-devscripts (>= 0.8.13),
                cdbs
   , libghc-tf-random-dev
diff -rN -u old-haskell-quickcheck/rules new-haskell-quickcheck/rules
--- old-haskell-quickcheck/rules	2014-08-10 12:46:58.267755486 +0000
+++ new-haskell-quickcheck/rules	2014-08-10 12:46:58.271755490 +0000
@@ -5,9 +5,7 @@
 DEB_CABAL_PACKAGE = quickcheck2
 
 # Disable templateHaskell on architecture that doesn't support it
-ifeq (,$(findstring $(DEB_HOST_ARCH),i386 amd64 kfreebsd-i386 kfreebsd-amd64))
-	DEB_SETUP_GHC6_CONFIGURE_ARGS = --flags=-templateHaskell
-endif
+DEB_SETUP_GHC_CONFIGURE_ARGS := $(shell test -e /usr/lib/ghc/bin/ghci || echo --flags=-templateHaskell)
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk