Revert "Build with ghc's threaded runtime, so threaded code does not busy-wait."
This reverts commit 129f6123fe
.
Saw hang during batch add with -threaded, so deferred for now.
This commit is contained in:
parent
129f6123fe
commit
0847a300fc
3 changed files with 4 additions and 6 deletions
2
Makefile
2
Makefile
|
@ -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
|
||||
|
|
1
debian/changelog
vendored
1
debian/changelog
vendored
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue