diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-11 12:20:38 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-11 12:21:18 -0400 |
| commit | 129f6123fe933310829986fd5a99a9fd6911ca0f (patch) | |
| tree | 2d8b172e0cfa7fc5aa36b8347bc79c5501c01524 | |
| parent | a5a3cd55ac2bab656824e48d29ead8382c583b01 (diff) | |
Build with ghc's threaded runtime, so threaded code does not busy-wait.
Sort of a work around for http://bugs.debian.org/677096
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | git-annex.cabal | 7 |
3 files changed, 6 insertions, 4 deletions
@@ -1,6 +1,6 @@ PREFIX=/usr IGNORE=-ignore-package monads-fd -ignore-package monads-tf -BASEFLAGS=-Wall $(IGNORE) -outputdir tmp -IUtility -DWITH_S3 +BASEFLAGS=-threaded -Wall $(IGNORE) -outputdir tmp -IUtility -DWITH_S3 GHCFLAGS=-O2 $(BASEFLAGS) ifdef PROFILE diff --git a/debian/changelog b/debian/changelog index 4ea0f46ac..fcf8be9a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ git-annex (3.20120612) UNRELEASED; urgency=low * watch: New subcommand, which uses inotify to watch for changes to files and automatically annexes new files, etc, so you don't need to manually run git commands when manipulating files. + * Build with ghc's threaded runtime, so threaded code does not busy-wait. -- Joey Hess <joeyh@debian.org> Tue, 05 Jun 2012 20:25:51 -0400 diff --git a/git-annex.cabal b/git-annex.cabal index 3459eaae0..9bfb5eec6 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 3.20120611 +Version: 3.20120612 Cabal-Version: >= 1.8 License: GPL Maintainer: Joey Hess <joey@kitenet.net> @@ -36,10 +36,11 @@ Executable git-annex pcre-light, extensible-exceptions, dataenc, SHA, process, json, HTTP, base == 4.5.*, monad-control, transformers-base, lifted-base, IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, - hinotify, STM + hinotify, stm Other-Modules: Utility.Touch C-Sources: Utility/libdiskfree.c Extensions: CPP + GHC-options: -threaded if flag(S3) Build-Depends: hS3 @@ -53,7 +54,7 @@ Test-Suite test pcre-light, extensible-exceptions, dataenc, SHA, process, json, HTTP, base == 4.5.*, monad-control, transformers-base, lifted-base, IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, - hinotify, STM + hinotify, stm C-Sources: Utility/libdiskfree.c Extensions: CPP |