[DHG_packages] 02/02: servant: Disable doctests on armel

[Ilias Tsitsimpis]

This is an automated email from the git hooks/post-receive script.

iliastsi-guest pushed a commit to branch master
in repository DHG_packages.

commit 542c6ca9f08aa87e4e724ed7c1cb9acd1b35f17f
Author: Ilias Tsitsimpis <iliastsi at debian.org>
Date:   Thu Nov 16 13:16:26 2017 +0200

    servant: Disable doctests on armel
---
 p/haskell-servant/debian/changelog                |  5 ++--
 p/haskell-servant/debian/patches/disable-doctests | 31 +++++++++++++++++++++++
 p/haskell-servant/debian/patches/series           |  1 +
 p/haskell-servant/debian/rules                    |  5 ++++
 4 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/p/haskell-servant/debian/changelog b/p/haskell-servant/debian/changelog
index 07a3d46..8633a4b 100644
--- a/p/haskell-servant/debian/changelog
+++ b/p/haskell-servant/debian/changelog
@@ -1,12 +1,13 @@
-haskell-servant (0.11-3) UNRELEASED; urgency=medium
+haskell-servant (0.11-3) unstable; urgency=medium
 
   * Change Priority to optional. Since Debian Policy version 4.0.1,
     priority extra has been deprecated.
   * Use the HTTPS form of the copyright-format URL
   * Modify d/watch and Source field in d/copyright to use HTTPS
   * Declare compliance with Debian policy 4.1.1
+  * Disable doctests on armel
 
- -- Ilias Tsitsimpis <iliastsi at debian.org>  Wed, 01 Nov 2017 12:15:11 +0200
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Thu, 16 Nov 2017 13:16:18 +0200
 
 haskell-servant (0.11-2) unstable; urgency=medium
 
diff --git a/p/haskell-servant/debian/patches/disable-doctests b/p/haskell-servant/debian/patches/disable-doctests
new file mode 100644
index 0000000..1cafb51
--- /dev/null
+++ b/p/haskell-servant/debian/patches/disable-doctests
@@ -0,0 +1,31 @@
+Description: Add test-doctests flag
+ Add flag to enable/disable the doctest suite. This is needed because doctests
+ fail on armel because of #839840.
+Author: Ilias Tsitsimpis <iliastsi at debian.org>
+---
+
+Index: b/servant.cabal
+===================================================================
+--- a/servant.cabal
++++ b/servant.cabal
+@@ -25,6 +25,10 @@ source-repository head
+   type: git
+   location: http://github.com/haskell-servant/servant.git
+ 
++flag test-doctests
++  description: Enable/Disable the doctest suite
++  default: True
++
+ custom-setup
+   setup-depends:
+     base >= 4 && <5,
+@@ -146,7 +150,8 @@ test-suite doctests
+               , hspec
+  type: exitcode-stdio-1.0
+  main-is: test/doctests.hs
+- buildable: True
++ if !flag(test-doctests)
++   buildable: False
+  default-language: Haskell2010
+  ghc-options: -Wall -threaded
+  if impl(ghc >= 8.2)
diff --git a/p/haskell-servant/debian/patches/series b/p/haskell-servant/debian/patches/series
index 30c91d0..0b57ed5 100644
--- a/p/haskell-servant/debian/patches/series
+++ b/p/haskell-servant/debian/patches/series
@@ -1 +1,2 @@
 newer-deps-from-hackage
+disable-doctests
diff --git a/p/haskell-servant/debian/rules b/p/haskell-servant/debian/rules
index fbda86d..249af05 100755
--- a/p/haskell-servant/debian/rules
+++ b/p/haskell-servant/debian/rules
@@ -6,5 +6,10 @@ DEB_DEFAULT_COMPILER = ghc
 
 export LC_ALL=C.UTF-8
 
+# doctests fail on armel due to #839840
+ifeq (armel,$(DEB_HOST_ARCH))
+	DEB_SETUP_GHC_CONFIGURE_ARGS += -f-test-doctests
+endif
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git