undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ph/enable-threaded'

Browse Source 
* ph/enable-threaded:
  Enable threaded delta search on *BSD and Linux.
This commit is contained in:
Junio C Hamano 2008-08-19 21:43:01 -07:00
commit 652b0bbe09
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

@ -578,9 +578,11 @@ EXTLIBS =
ifeq ($(uname_S),Linux) ifeq ($(uname_S),Linux)
NO_STRLCPY = YesPlease NO_STRLCPY = YesPlease
THREADED_DELTA_SEARCH = YesPlease
endif endif
ifeq ($(uname_S),GNU/kFreeBSD) ifeq ($(uname_S),GNU/kFreeBSD)
NO_STRLCPY = YesPlease NO_STRLCPY = YesPlease
THREADED_DELTA_SEARCH = YesPlease
endif endif
ifeq ($(uname_S),UnixWare) ifeq ($(uname_S),UnixWare)
CC = cc CC = cc
@ -678,6 +680,7 @@ ifeq ($(uname_S),FreeBSD)
BASIC_CFLAGS += -I/usr/local/include BASIC_CFLAGS += -I/usr/local/include
BASIC_LDFLAGS += -L/usr/local/lib BASIC_LDFLAGS += -L/usr/local/lib
DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease
THREADED_DELTA_SEARCH = YesPlease
endif endif
ifeq ($(uname_S),OpenBSD) ifeq ($(uname_S),OpenBSD)
NO_STRCASESTR = YesPlease NO_STRCASESTR = YesPlease
@ -685,6 +688,7 @@ ifeq ($(uname_S),OpenBSD)
NEEDS_LIBICONV = YesPlease NEEDS_LIBICONV = YesPlease
BASIC_CFLAGS += -I/usr/local/include BASIC_CFLAGS += -I/usr/local/include
BASIC_LDFLAGS += -L/usr/local/lib BASIC_LDFLAGS += -L/usr/local/lib
THREADED_DELTA_SEARCH = YesPlease
endif endif
ifeq ($(uname_S),NetBSD) ifeq ($(uname_S),NetBSD)
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2) ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
@ -693,6 +697,7 @@ ifeq ($(uname_S),NetBSD)
BASIC_CFLAGS += -I/usr/pkg/include BASIC_CFLAGS += -I/usr/pkg/include
BASIC_LDFLAGS += -L/usr/pkg/lib BASIC_LDFLAGS += -L/usr/pkg/lib
ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib
THREADED_DELTA_SEARCH = YesPlease
endif endif
ifeq ($(uname_S),AIX) ifeq ($(uname_S),AIX)
NO_STRCASESTR=YesPlease NO_STRCASESTR=YesPlease