Adjust cabal file to support building w/o assistant on the hurd.
I used to have this and hackage rejected the os(gnu), so I am going to see if the new hackage still rejects it.
This commit is contained in:
parent
0bfc4875e2
commit
1d5bde3be5
2 changed files with 10 additions and 3 deletions
6
debian/changelog
vendored
6
debian/changelog
vendored
|
@ -1,3 +1,9 @@
|
|||
git-annex (5.20140928) UNRELEASED; urgency=medium
|
||||
|
||||
* Adjust cabal file to support building w/o assistant on the hurd.
|
||||
|
||||
-- Joey Hess <joeyh@debian.org> Mon, 29 Sep 2014 14:07:51 -0400
|
||||
|
||||
git-annex (5.20140927) unstable; urgency=medium
|
||||
|
||||
* Really depend (not just build-depend) on new enough git for --no-gpg-sign
|
||||
|
|
|
@ -153,7 +153,7 @@ Executable git-annex
|
|||
Build-Depends: DAV (>= 1.0), http-client
|
||||
CPP-Options: -DWITH_WEBDAV
|
||||
|
||||
if flag(Assistant) && ! os(solaris)
|
||||
if flag(Assistant) && ! os(solaris) && ! os(gnu)
|
||||
CPP-Options: -DWITH_ASSISTANT
|
||||
|
||||
if flag(Assistant)
|
||||
|
@ -174,8 +174,9 @@ Executable git-annex
|
|||
Build-Depends: hinotify
|
||||
CPP-Options: -DWITH_INOTIFY
|
||||
else
|
||||
CPP-Options: -DWITH_KQUEUE
|
||||
C-Sources: Utility/libkqueue.c
|
||||
if ! os(gnu)
|
||||
CPP-Options: -DWITH_KQUEUE
|
||||
C-Sources: Utility/libkqueue.c
|
||||
|
||||
if (os(linux))
|
||||
if flag(Dbus)
|
||||
|
|
Loading…
Reference in a new issue