[Pkg-haskell-commits] [SCM] Shell Scripting Tools for Haskell branch, master, updated. debian/2.0.3-4-2-g4ba94f0
Joachim Breitner
nomeata at debian.org
Sat Jun 4 20:33:22 UTC 2011
The following commit has been merged in the master branch:
commit ef9f32649f3bcd5999693e1888bacb319841fd07
Author: Joachim Breitner <nomeata at debian.org>
Date: Sat Jun 4 22:31:47 2011 +0200
Fix detection of threaded runtime (include hlibrary.mk first!)
diff --git a/debian/changelog b/debian/changelog
index 0cdb67b..358679f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+haskell-hsh (2.0.3-5) UNRELEASED; urgency=low
+
+ * Fix detection of threaded runtime (include hlibrary.mk first!)
+
+ -- Joachim Breitner <nomeata at debian.org> Sat, 04 Jun 2011 22:31:25 +0200
+
haskell-hsh (2.0.3-4) unstable; urgency=low
* [482498f] s/ghc6/ghc/
diff --git a/debian/rules b/debian/rules
index 44e0d20..4293dac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,9 @@
#!/usr/bin/make -f
-# If no threaded RTS is found, disable it
-DEB_SETUP_GHC6_CONFIGURE_ARGS := $(shell test -e /usr/lib/ghc-$(GHC6_VERSION)/libHSrts_thr.a || echo --flags=-threaded)
-
# Standard way of building Haskell libraries .
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
+# If no threaded RTS is found, disable it
+DEB_SETUP_GHC6_CONFIGURE_ARGS := $(shell test -e /usr/lib/ghc-$(GHC6_VERSION)/libHSrts_thr.a || echo --flags=-threaded)
+
--
Shell Scripting Tools for Haskell
More information about the Pkg-haskell-commits
mailing list