diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-07-25 13:57:53 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-07-25 13:57:53 -0400 |
| commit | 2f63f062e5b046d687c30810b4f55e0ba4671125 (patch) | |
| tree | 79a522ee69c1f23d3dc50b1af14eed5fd6a877a4 | |
| parent | 86234f404a93fb352ecba16076e9347deef04d4c (diff) | |
Always build with -threaded, to avoid a deadlock when communicating with gpg.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/bugs/gpg_hangs_on_glacier_remote_creation.mdwn | 2 | ||||
| -rw-r--r-- | git-annex.cabal | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index f930df2ab..14e6f81f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 diff --git a/doc/bugs/gpg_hangs_on_glacier_remote_creation.mdwn b/doc/bugs/gpg_hangs_on_glacier_remote_creation.mdwn index 2eaebe290..b4aaa57ea 100644 --- a/doc/bugs/gpg_hangs_on_glacier_remote_creation.mdwn +++ b/doc/bugs/gpg_hangs_on_glacier_remote_creation.mdwn @@ -74,3 +74,5 @@ $> ps ax | grep gpg | grep -v ssh # End of transcript or log. """]] + +> [[done]]; see comments --[[Joey]] diff --git a/git-annex.cabal b/git-annex.cabal index cfaeacb03..b9715b847 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -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 |