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

avoid building watch or assistant on Solaris

Browse source 
Solaris does not use kqueue, it has some other poll interface.
This commit is contained in:
Joey Hess 2012-10-17 13:41:09 -04:00
parent 788051802a
commit baad8829c8
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -20,6 +20,10 @@ OPTFLAGS?=-DWITH_INOTIFY
clibs=Utility/libdiskfree.o Utility/libmounts.o clibs=Utility/libdiskfree.o Utility/libmounts.o
THREADFLAGS=$(shell if test -e `ghc --print-libdir`/libHSrts_thr.a; then printf -- -threaded; fi) THREADFLAGS=$(shell if test -e `ghc --print-libdir`/libHSrts_thr.a; then printf -- -threaded; fi)
else else
ifeq ($(OS),Solaris)
# Solaris is not supported by the assistant or watch command.
FEATURES:=$(shell echo $(FEATURES) | sed -e 's/-DWITH_ASSISTANT//' -e 's/-DWITH_WEBAPP//')
else
# BSD system # BSD system
THREADFLAGS=-threaded THREADFLAGS=-threaded
OPTFLAGS?=-DWITH_KQUEUE OPTFLAGS?=-DWITH_KQUEUE
@ -32,6 +36,7 @@ CFLAGS=-Wall -m32
endif endif
endif endif
endif endif
endif
ALLFLAGS = $(BASEFLAGS) $(FEATURES) $(OPTFLAGS) $(THREADFLAGS) ALLFLAGS = $(BASEFLAGS) $(FEATURES) $(OPTFLAGS) $(THREADFLAGS)