diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-19 21:44:33 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-19 21:44:33 -0400 |
| commit | ff1cb82cffdf2a5078937f5bc9b42af29aebf205 (patch) | |
| tree | ce5daef36b3b8e9139b07361785b02634deab03e | |
| parent | 3e942af981f2d0a4c5dd77a3f72e5513905eeba8 (diff) | |
debian architecture build fun
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | git-annex.cabal | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index b3bea55ab..a68b62dd9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,11 @@ git-annex (4.20130517) UNRELEASED; urgency=low * Fix a zombie that could result when running a process like gpg to read and write to it. * Allow building with gpg2. + * Disable building with the haskell threaded runtime when the webapp + is not built. This may fix builds on mips, s390x and sparc, which are + failing to link -lHSrts_thr + * Temporarily build without webapp on kfreebsd-i386, until yesod is + installable there again. -- Joey Hess <joeyh@debian.org> Fri, 17 May 2013 11:17:03 -0400 diff --git a/debian/control b/debian/control index 2a914fc0b..4c38357e1 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,7 @@ Build-Depends: libghc-dbus-dev (>= 0.10.3) [linux-any], libghc-yesod-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64], libghc-yesod-static-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64], - libghc-yesod-default-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64], + libghc-yesod-default-dev [i386 amd64 kfreebsd-amd64], libghc-hamlet-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64], libghc-clientsession-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64], libghc-warp-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64], diff --git a/git-annex.cabal b/git-annex.cabal index a9f229697..0652fb275 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -110,7 +110,6 @@ Executable git-annex if flag(Assistant) && ! os(windows) && ! os(solaris) Build-Depends: async, stm (>= 2.3) CPP-Options: -DWITH_ASSISTANT - GHC-Options: -threaded if flag(Android) Build-Depends: data-endian @@ -138,6 +137,7 @@ Executable git-annex crypto-api, hamlet, clientsession, aeson, yesod-form, template-haskell, yesod-default, data-default CPP-Options: -DWITH_WEBAPP + GHC-Options: -threaded if flag(Pairing) Build-Depends: network-multicast, network-info |