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

add solaris workaround to cabal file too

Browse source 
uname reports SunOS, but cabal seems to use solaris.
This commit is contained in:
Joey Hess 2012-10-17 22:00:29 -04:00
parent 5265ca4423
commit 46d1b25bce
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -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

9
git-annex.cabal
View file

@ -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