debian architecture build fun
This commit is contained in:
parent
e89c5b467f
commit
9fa063a00f
3 changed files with 7 additions and 2 deletions
5
debian/changelog
vendored
5
debian/changelog
vendored
|
@ -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
|
||||
|
||||
|
|
2
debian/control
vendored
2
debian/control
vendored
|
@ -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],
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue