diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-17 22:00:29 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-17 22:00:29 -0400 |
| commit | ba48296365531e4d371cd9a4b65c0e748105d4ee (patch) | |
| tree | a217a3346eba297e58951d9cfa355d040e21f1bc | |
| parent | 248e0d96aa444234db72aa0d7824cc018c4f8277 (diff) | |
add solaris workaround to cabal file too
uname reports SunOS, but cabal seems to use solaris.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | git-annex.cabal | 9 |
2 files changed, 5 insertions, 6 deletions
@@ -20,7 +20,7 @@ OPTFLAGS?=-DWITH_INOTIFY clibs=Utility/libdiskfree.o Utility/libmounts.o THREADFLAGS=$(shell if test -e `ghc --print-libdir`/libHSrts_thr.a; then printf -- -threaded; fi) else -ifeq ($(OS),Solaris) +ifeq ($(OS),SunOS) # Solaris is not supported by the assistant or watch command. FEATURES:=$(shell echo $(FEATURES) | sed -e 's/-DWITH_ASSISTANT//' -e 's/-DWITH_WEBAPP//') else diff --git a/git-annex.cabal b/git-annex.cabal index 20d4211ee..d27843d01 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 3.20121017 +Version: 3.20121018 Cabal-Version: >= 1.8 License: GPL Maintainer: Joey Hess <joey@kitenet.net> @@ -55,8 +55,6 @@ Executable git-annex Other-Modules: Utility.Touch Utility.Mounts Include-Dirs: Utility C-Sources: Utility/libdiskfree.c Utility/libmounts.c - if (! os(linux)) - C-Sources: Utility/libkqueue.c Extensions: CPP GHC-Options: -threaded CPP-Options: -DURI_24 @@ -65,7 +63,7 @@ Executable git-annex Build-Depends: hS3 CPP-Options: -DWITH_S3 - if flag(Assistant) + if flag(Assistant) && ! os(windows) && ! os(solaris) Build-Depends: stm >= 2.3 CPP-Options: -DWITH_ASSISTANT @@ -73,8 +71,9 @@ Executable git-annex Build-Depends: hinotify CPP-Options: -DWITH_INOTIFY else - if (! os(windows)) + if (! os(windows) && ! os(solaris)) CPP-Options: -DWITH_KQUEUE + C-Sources: Utility/libkqueue.c if os(linux) && flag(Dbus) Build-Depends: dbus |