diff options
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | git-annex.cabal | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -13,6 +13,8 @@ git-annex (6.20180113) UNRELEASED; urgency=medium * --json: When there are multiple lines of notes about a file, make the note field multiline, rather than the old behavior of only including the last line. + * git-annex.cabal: Once more try to not build the assistant on the hurd, + hopefully hackage finally recognises that OS. -- Joey Hess <id@joeyh.name> Wed, 24 Jan 2018 20:42:55 -0400 diff --git a/git-annex.cabal b/git-annex.cabal index d93421225..446695fc8 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -411,7 +411,7 @@ Executable git-annex Remote.WebDAV Remote.WebDAV.DavLocation - if flag(Assistant) && ! os(solaris) + if flag(Assistant) && ! os(solaris) && ! os(gnu) Build-Depends: dns (>= 1.0.0), mountpoints CPP-Options: -DWITH_ASSISTANT @@ -431,7 +431,7 @@ Executable git-annex CPP-Options: -DWITH_WIN32NOTIFY Other-Modules: Utility.DirWatcher.Win32Notify else - if (! os(solaris) && ! os(linux)) + if (! os(solaris) && ! os(gnu) && ! os(linux)) CPP-Options: -DWITH_KQUEUE C-Sources: Utility/libkqueue.c Includes: Utility/libkqueue.h |