[Pkg-haskell-commits] darcs: shelltestrunner: Remove non-threaded support

Iustin Pop iustin at debian.org
Sat May 19 19:15:59 UTC 2012


Sat May 19 18:36:04 UTC 2012  Iustin Pop <iustin at debian.org>
  * Remove non-threaded support
  Ignore-this: 4ef1a8c382b5950fd0b27c83147910
  
  Since hGetContents (at least the way shelltestrunner uses it) doesn't work
  correctly in non-threaded mode, we remove support for non-threaded arches.
  

    M ./control -1 +1
    M ./patches/series -1
    M ./rules -3

Sat May 19 18:36:04 UTC 2012  Iustin Pop <iustin at debian.org>
  * Remove non-threaded support
  Ignore-this: 4ef1a8c382b5950fd0b27c83147910
  
  Since hGetContents (at least the way shelltestrunner uses it) doesn't work
  correctly in non-threaded mode, we remove support for non-threaded arches.
  
diff -rN -u old-shelltestrunner//control new-shelltestrunner//control
--- old-shelltestrunner//control	2012-05-19 19:15:59.250325749 +0000
+++ new-shelltestrunner//control	2012-05-19 19:15:59.318325925 +0000
@@ -27,7 +27,7 @@
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/shelltestrunner
 
 Package: shelltestrunner
-Architecture: any
+Architecture: amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 powerpc
 Depends: ${haskell:Depends}
   , ${shlibs:Depends}
   , ${misc:Depends}
diff -rN -u old-shelltestrunner//patches/series new-shelltestrunner//patches/series
--- old-shelltestrunner//patches/series	2012-05-19 19:15:59.250325749 +0000
+++ new-shelltestrunner//patches/series	2012-05-19 19:15:59.306326368 +0000
@@ -1,2 +1 @@
 remove-cabal-th-dependency.patch
-add-threaded-flag.patch
diff -rN -u old-shelltestrunner//rules new-shelltestrunner//rules
--- old-shelltestrunner//rules	2012-05-19 19:15:59.250325749 +0000
+++ new-shelltestrunner//rules	2012-05-19 19:15:59.282325087 +0000
@@ -3,9 +3,6 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
 
-# Disable linking with the threaded runtime if not available
-DEB_SETUP_GHC_CONFIGURE_ARGS += $(shell test -e /usr/lib/ghc-$(GHC_VERSION)/libHSrts_thr.a || echo --flags=-threaded)
-
 build/$(CABAL_PACKAGE) :: build-ghc-stamp
 
 install/$(CABAL_PACKAGE) :: build/$(CABAL_PACKAGE)





More information about the Pkg-haskell-commits mailing list