[DHG_packages] 02/02: debian: patch to build executables without -threaded on architectures without threaded runtime

[Clint Adams]

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

clint pushed a commit to branch master
in repository DHG_packages.

commit 9e2d807e3afd11bb7b2500c1ae841b83bfdd3510
Author: Clint Adams <clint at debian.org>
Date:   Tue Jun 27 22:14:57 2017 -0400

    debian: patch to build executables without -threaded on architectures without threaded runtime
---
 p/haskell-debian/debian/changelog               |  2 ++
 p/haskell-debian/debian/patches/series          |  1 +
 p/haskell-debian/debian/patches/threaded-option | 45 +++++++++++++++++++++++++
 p/haskell-debian/debian/rules                   |  1 +
 4 files changed, 49 insertions(+)

diff --git a/p/haskell-debian/debian/changelog b/p/haskell-debian/debian/changelog
index 7ce1a0a..590becb 100644
--- a/p/haskell-debian/debian/changelog
+++ b/p/haskell-debian/debian/changelog
@@ -1,6 +1,8 @@
 haskell-debian (3.91.2-1) unstable; urgency=medium
 
   * New upstream release
+  * Patch to build executables without -threaded on architectures
+    without threaded runtime.
 
  -- Clint Adams <clint at debian.org>  Tue, 27 Jun 2017 22:10:23 -0400
 
diff --git a/p/haskell-debian/debian/patches/series b/p/haskell-debian/debian/patches/series
new file mode 100644
index 0000000..cbcd434
--- /dev/null
+++ b/p/haskell-debian/debian/patches/series
@@ -0,0 +1 @@
+threaded-option
diff --git a/p/haskell-debian/debian/patches/threaded-option b/p/haskell-debian/debian/patches/threaded-option
new file mode 100644
index 0000000..f11eb0b
--- /dev/null
+++ b/p/haskell-debian/debian/patches/threaded-option
@@ -0,0 +1,45 @@
+--- a/debian.cabal
++++ b/debian.cabal
+@@ -24,6 +24,10 @@
+  Description: pretty-1.1.2 includes the Text.PrettyPrint.HughesPJClass module from prettyclass
+  Default: True
+ 
++flag threaded
++  description: build threaded
++  default: True
++
+ Library
+  Hs-Source-Dirs: .
+  Build-Depends:
+@@ -107,14 +111,18 @@
+  Hs-Source-Dirs: utils
+  Main-is: FakeChanges.hs
+  Build-Depends: base, debian, directory, filepath
+- ghc-options: -threaded -W -O2
++ ghc-options: -W -O2
++ if flag(threaded)
++   ghc-options: -threaded
+  Extensions:           ExistentialQuantification CPP
+ 
+ Executable debian-report
+  Hs-Source-Dirs: utils
+  Main-is: Report.hs
+  Build-Depends: base, debian, HaXml, unix
+- ghc-options: -threaded -W -O2
++ ghc-options: -W -O2
++ if flag(threaded)
++   ghc-options: -threaded
+  C-Sources:           cbits/gwinsz.c
+  Include-Dirs:        cbits
+  Install-Includes:    gwinsz.h
+@@ -125,7 +133,9 @@
+  Hs-Source-Dirs: utils
+  Main-is: AptGetBuildDeps.hs
+  Build-Depends: base, debian, process
+- ghc-options: -threaded -W -O2
++ ghc-options: -W -O2
++ if flag(threaded)
++   ghc-options: -threaded
+  Extensions:           ExistentialQuantification CPP
+ 
+ Test-Suite debian-tests
diff --git a/p/haskell-debian/debian/rules b/p/haskell-debian/debian/rules
index 2defdf7..6e70bb3 100755
--- a/p/haskell-debian/debian/rules
+++ b/p/haskell-debian/debian/rules
@@ -2,6 +2,7 @@
 
 DEB_BUILD_DEPENDENCIES = build-arch
 DEB_ENABLE_TESTS = yes
+DEB_SETUP_GHC_CONFIGURE_ARGS=$(if $(wildcard /usr/lib/ghc/*/libHSrts_thr.a),,-f-threaded)
 
 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