[DHG_packages] 01/01: safe-exceptions: patch to build tests single-threaded on platforms without SMP support, such as arm* and s390x.
Clint Adams
clint at moszumanska.debian.org
Wed Nov 2 02:09:28 UTC 2016
This is an automated email from the git hooks/post-receive script.
clint pushed a commit to branch master
in repository DHG_packages.
commit b2fcbac2d138da0f165abcb1bf79be8cd88603c5
Author: Clint Adams <clint at debian.org>
Date: Tue Nov 1 22:06:55 2016 -0400
safe-exceptions: patch to build tests single-threaded on platforms without SMP support, such as arm* and s390x.
---
p/haskell-safe-exceptions/debian/changelog | 7 +++++++
p/haskell-safe-exceptions/debian/patches/series | 1 +
p/haskell-safe-exceptions/debian/patches/smp-tests | 23 ++++++++++++++++++++++
p/haskell-safe-exceptions/debian/rules | 4 ++++
4 files changed, 35 insertions(+)
diff --git a/p/haskell-safe-exceptions/debian/changelog b/p/haskell-safe-exceptions/debian/changelog
index 29e0daa..34086d0 100644
--- a/p/haskell-safe-exceptions/debian/changelog
+++ b/p/haskell-safe-exceptions/debian/changelog
@@ -1,3 +1,10 @@
+haskell-safe-exceptions (0.1.4.0-4) unstable; urgency=medium
+
+ * Patch to build tests single-threaded on platforms without
+ SMP support, such as arm* and s390x.
+
+ -- Clint Adams <clint at debian.org> Tue, 01 Nov 2016 22:05:58 -0400
+
haskell-safe-exceptions (0.1.4.0-3) unstable; urgency=medium
* Upload to unstable as part of GHC 8 transition.
diff --git a/p/haskell-safe-exceptions/debian/patches/series b/p/haskell-safe-exceptions/debian/patches/series
new file mode 100644
index 0000000..d094866
--- /dev/null
+++ b/p/haskell-safe-exceptions/debian/patches/series
@@ -0,0 +1 @@
+smp-tests
diff --git a/p/haskell-safe-exceptions/debian/patches/smp-tests b/p/haskell-safe-exceptions/debian/patches/smp-tests
new file mode 100644
index 0000000..b247382
--- /dev/null
+++ b/p/haskell-safe-exceptions/debian/patches/smp-tests
@@ -0,0 +1,23 @@
+--- a/safe-exceptions.cabal
++++ b/safe-exceptions.cabal
+@@ -13,6 +13,10 @@
+ extra-source-files: README.md ChangeLog.md COOKBOOK.md
+ cabal-version: >=1.10
+
++flag tests-single-threaded
++ description: Build tests single-threaded
++ default: False
++
+ library
+ hs-source-dirs: src
+ exposed-modules: Control.Exception.Safe
+@@ -31,7 +35,8 @@
+ , hspec
+ , safe-exceptions
+ , void
+- ghc-options: -threaded -rtsopts -with-rtsopts=-N
++ if !flag(tests-single-threaded)
++ ghc-options: -threaded -rtsopts -with-rtsopts=-N
+ default-language: Haskell2010
+
+ source-repository head
diff --git a/p/haskell-safe-exceptions/debian/rules b/p/haskell-safe-exceptions/debian/rules
index 7f05bdd..d30a6b8 100755
--- a/p/haskell-safe-exceptions/debian/rules
+++ b/p/haskell-safe-exceptions/debian/rules
@@ -4,5 +4,9 @@ DEB_ENABLE_TESTS = yes
DEB_CABAL_PACKAGE = safe-exceptions
DEB_DEFAULT_COMPILER = ghc
+ifeq (no,$(shell ghc --info | grep -q 'Support SMP.*NO' && echo no))
+DEB_SETUP_GHC_CONFIGURE_ARGS += -ftests-single-threaded
+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
More information about the Pkg-haskell-commits
mailing list