Merge branch 'jk/fix-profile-feedback-build'
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 Aug 2014 18:16:25 +0000 (11:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 Aug 2014 18:16:25 +0000 (11:16 -0700)
Fix profile-feedback build broken in 2.1 for tarball releases.

* jk/fix-profile-feedback-build:
Makefile: make perf tests optional for profile build

1  2 
Makefile
diff --combined Makefile
index 2320de592e6dbc545866e6bfef09a05f660c2c14,fd1138032cfc80705cd2ad11508b7327cc8bfe84..9f984a9e5561d6b67b453124a311963ae8845f6d
+++ b/Makefile
@@@ -340,8 -340,6 +340,8 @@@ all:
  #
  # Define GMTIME_UNRELIABLE_ERRORS if your gmtime() function does not
  # return NULL when it receives a bogus time_t.
 +#
 +# Define HAVE_CLOCK_GETTIME if your platform has clock_gettime in librt.
  
  GIT-VERSION-FILE: FORCE
        @$(SHELL_PATH) ./GIT-VERSION-GEN
@@@ -554,7 -552,6 +554,7 @@@ TEST_PROGRAMS_NEED_X += test-ctyp
  TEST_PROGRAMS_NEED_X += test-date
  TEST_PROGRAMS_NEED_X += test-delta
  TEST_PROGRAMS_NEED_X += test-dump-cache-tree
 +TEST_PROGRAMS_NEED_X += test-dump-split-index
  TEST_PROGRAMS_NEED_X += test-genrandom
  TEST_PROGRAMS_NEED_X += test-hashmap
  TEST_PROGRAMS_NEED_X += test-index-version
@@@ -878,7 -875,6 +878,7 @@@ LIB_OBJS += sha1_name.
  LIB_OBJS += shallow.o
  LIB_OBJS += sideband.o
  LIB_OBJS += sigchain.o
 +LIB_OBJS += split-index.o
  LIB_OBJS += strbuf.o
  LIB_OBJS += streaming.o
  LIB_OBJS += string-list.o
@@@ -1003,7 -999,6 +1003,7 @@@ BUILTIN_OBJS += builtin/update-ref.
  BUILTIN_OBJS += builtin/update-server-info.o
  BUILTIN_OBJS += builtin/upload-archive.o
  BUILTIN_OBJS += builtin/var.o
 +BUILTIN_OBJS += builtin/verify-commit.o
  BUILTIN_OBJS += builtin/verify-pack.o
  BUILTIN_OBJS += builtin/verify-tag.o
  BUILTIN_OBJS += builtin/write-tree.o
@@@ -1502,11 -1497,6 +1502,11 @@@ ifdef GMTIME_UNRELIABLE_ERROR
        BASIC_CFLAGS += -DGMTIME_UNRELIABLE_ERRORS
  endif
  
 +ifdef HAVE_CLOCK_GETTIME
 +      BASIC_CFLAGS += -DHAVE_CLOCK_GETTIME
 +      EXTLIBS += -lrt
 +endif
 +
  ifeq ($(TCLTK_PATH),)
  NO_TCLTK = NoThanks
  endif
@@@ -1659,7 -1649,11 +1659,11 @@@ endi
  profile:: profile-clean
        $(MAKE) PROFILE=GEN all
        $(MAKE) PROFILE=GEN -j1 test
-       $(MAKE) PROFILE=GEN -j1 perf
+       @if test -n "$$GIT_PERF_REPO" || test -d .git; then \
+               $(MAKE) PROFILE=GEN -j1 perf; \
+       else \
+               echo "Skipping profile of perf tests..."; \
+       fi
        $(MAKE) PROFILE=USE all
  
  profile-fast: profile-clean