Always build with -threaded, to avoid a deadlock when communicating with gpg.

This commit is contained in:
Joey Hess 2013-07-25 13:57:53 -04:00
parent 2842ea4309
commit fc1a79835b
3 changed files with 6 additions and 1 deletions

2
debian/changelog vendored
View file

@ -4,6 +4,8 @@ git-annex (4.20130724) UNRELEASED; urgency=low
the client is a git-annex client. Closes: #717652
* webapp: When creating a repository on a removable drive, set
core.fsyncobjectfiles, to help prevent data loss when the drive is yanked.
* Always build with -threaded, to avoid a deadlock when communicating with
gpg.
-- Joey Hess <joeyh@debian.org> Tue, 23 Jul 2013 12:39:48 -0400

View file

@ -74,3 +74,5 @@ $> ps ax | grep gpg | grep -v ssh
# End of transcript or log.
"""]]
> [[done]]; see comments --[[Joey]]

View file

@ -82,6 +82,8 @@ Executable git-annex
GHC-Options: -Wall
CPP-Options: -DWITH_CLIBS
Extensions: PackageImports
-- Some things don't work with the non-threaded RTS.
GHC-Options: -threaded
if flag(Production)
GHC-Options: -O2
@ -139,7 +141,6 @@ Executable git-annex
blaze-builder, crypto-api, hamlet, clientsession, aeson,
template-haskell, data-default
CPP-Options: -DWITH_WEBAPP
GHC-Options: -threaded
if flag(Pairing)
Build-Depends: network-multicast, network-info