diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-09-14 22:33:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-14 22:33:28 -0700 |
| commit | d225ae59c9102f2769c55749f80f7a94a92713e4 (patch) | |
| tree | 35ed2e2aa5a7346f96fb46ef76a88df309acaf59 /Makefile | |
| parent | 357c5e086c28581918329281be18ab236d33967f (diff) | |
| parent | e1ef867328bd7d2cd67499ac30479821bdf96662 (diff) | |
| download | git-d225ae59c9102f2769c55749f80f7a94a92713e4.tar.gz git-d225ae59c9102f2769c55749f80f7a94a92713e4.tar.xz | |
Merge branch 'np/delta'
* np/delta:
builtin-pack-objects.c: avoid bogus gcc warnings
threaded delta search: proper locking for cache accounting
threaded delta search: add pack.threads config variable
fix threaded delta search locking
threaded delta search: specify number of threads at run time
threaded delta search: better chunck split point
threaded delta search: refine work allocation
basic threaded delta search
rearrange delta search progress reporting
localize window memory usage accounting
straighten the list of objects to deltify
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -124,6 +124,9 @@ all:: # If not set it defaults to the bare 'wish'. If it is set to the empty # string then NO_TCLTK will be forced (this is used by configure script). # +# Define THREADED_DELTA_SEARCH if you have pthreads and wish to exploit +# parallel delta searching when packing objects. +# GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE @$(SHELL_PATH) ./GIT-VERSION-GEN @@ -675,6 +678,11 @@ ifdef NO_MEMMEM COMPAT_OBJS += compat/memmem.o endif +ifdef THREADED_DELTA_SEARCH + BASIC_CFLAGS += -DTHREADED_DELTA_SEARCH + EXTLIBS += -lpthread +endif + ifeq ($(TCLTK_PATH),) NO_TCLTK=NoThanks endif |