mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable building with the haskell threaded runtime when the assistant is not built. This may fix builds on s390x and sparc, which are failing to link -lHSrts_thr

Browse source
This commit is contained in:
Joey Hess 2013-05-06 09:35:43 -04:00
parent 91ac5ab7f3
commit 8860cff556
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
debian/changelog vendored
View file

@ -4,6 +4,9 @@ git-annex (4.20130502) UNRELEASED; urgency=low
* Temporarily add an upper bound to the version of yesod that can be built
with, since yesod 1.2 has a great many changes that will require extensive
work on the webapp.
* Disable building with the haskell threaded runtime when the assistant
is not built. This may fix builds on s390x and sparc, which are failing
to link -lHSrts_thr
-- Joey Hess <joeyh@debian.org> Thu, 02 May 2013 20:39:19 -0400

3
git-annex.cabal
View file

@ -76,7 +76,7 @@ Executable git-annex
Include-Dirs: Utility
C-Sources: Utility/libdiskfree.c Utility/libmounts.c
CC-Options: -Wall
GHC-Options: -threaded -Wall
GHC-Options: -Wall
CPP-Options: -DWITH_CLIBS
Extensions: PackageImports
@ -98,6 +98,7 @@ 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