diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-11 12:46:35 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-11 12:46:35 -0400 |
| commit | 0847a300fc65a832171af53272439d18f6e9ed6b (patch) | |
| tree | 1d5503b35e7fdb27bcd2e1e3f8f1020686882125 | |
| parent | 129f6123fe933310829986fd5a99a9fd6911ca0f (diff) | |
Revert "Build with ghc's threaded runtime, so threaded code does not busy-wait."
This reverts commit 129f6123fe933310829986fd5a99a9fd6911ca0f.
Saw hang during batch add with -threaded, so deferred for now.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | git-annex.cabal | 7 |
3 files changed, 4 insertions, 6 deletions
@@ -1,6 +1,6 @@ PREFIX=/usr IGNORE=-ignore-package monads-fd -ignore-package monads-tf -BASEFLAGS=-threaded -Wall $(IGNORE) -outputdir tmp -IUtility -DWITH_S3 +BASEFLAGS=-Wall $(IGNORE) -outputdir tmp -IUtility -DWITH_S3 GHCFLAGS=-O2 $(BASEFLAGS) ifdef PROFILE diff --git a/debian/changelog b/debian/changelog index fcf8be9a9..4ea0f46ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,6 @@ 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 9bfb5eec6..3459eaae0 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 3.20120612 +Version: 3.20120611 Cabal-Version: >= 1.8 License: GPL Maintainer: Joey Hess <joey@kitenet.net> @@ -36,11 +36,10 @@ 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 @@ -54,7 +53,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 |