redis-quiet.patch 3.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384
  1. diff --git a/deps/Makefile b/deps/Makefile
  2. index 8592e17..0c13eea 100644
  3. --- a/deps/Makefile
  4. +++ b/deps/Makefile
  5. @@ -49,19 +49,19 @@ ifeq ($(BUILD_TLS),yes)
  6. endif
  7. hiredis: .make-prerequisites
  8. - @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
  9. + #@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
  10. cd hiredis && $(MAKE) static $(HIREDIS_MAKE_FLAGS)
  11. .PHONY: hiredis
  12. linenoise: .make-prerequisites
  13. - @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
  14. + #@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
  15. cd linenoise && $(MAKE)
  16. .PHONY: linenoise
  17. hdr_histogram: .make-prerequisites
  18. - @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
  19. + #@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
  20. cd hdr_histogram && $(MAKE)
  21. .PHONY: hdr_histogram
  22. @@ -85,7 +85,7 @@ AR=ar
  23. ARFLAGS=rc
  24. lua: .make-prerequisites
  25. - @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
  26. + #@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
  27. cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)"
  28. .PHONY: lua
  29. @@ -98,7 +98,7 @@ JEMALLOC_CONFIGURE_OPTS += --host=$(DEB_HOST_GNU_TYPE)
  30. endif
  31. jemalloc: .make-prerequisites
  32. - @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
  33. + #@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
  34. cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
  35. cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
  36. diff --git a/deps/jemalloc/Makefile.in b/deps/jemalloc/Makefile.in
  37. index 7128b00..da8e429 100644
  38. --- a/deps/jemalloc/Makefile.in
  39. +++ b/deps/jemalloc/Makefile.in
  40. @@ -406,7 +406,7 @@ $(objroot)include/jemalloc/internal/private_namespace_jet.gen.h: $(C_JET_SYMS)
  41. $(SHELL) $(srcroot)include/jemalloc/internal/private_namespace.sh $^ > $@
  42. %.h: %.gen.h
  43. - @if ! `cmp -s $< $@` ; then echo "cp $< $<"; cp $< $@ ; fi
  44. + @if ! `cmp -s $< $@` ; then cp $< $@ ; fi
  45. $(CPP_OBJS) $(CPP_PIC_OBJS) $(TESTS_CPP_OBJS): %.$(O):
  46. @mkdir -p $(@D)
  47. diff --git a/src/Makefile b/src/Makefile
  48. index e4f7d90..704d4b4 100644
  49. --- a/src/Makefile
  50. +++ b/src/Makefile
  51. @@ -115,7 +115,7 @@ endif
  52. # Override default settings if possible
  53. -include .make-settings
  54. -FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
  55. +FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) $(CPPFLAGS)
  56. FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
  57. FINAL_LIBS=-lm
  58. DEBUG=-g -ggdb
  59. @@ -326,9 +326,9 @@ REDIS_CHECK_AOF_NAME=redis-check-aof$(PROG_SUFFIX)
  60. ALL_SOURCES=$(sort $(patsubst %.o,%.c,$(REDIS_SERVER_OBJ) $(REDIS_CLI_OBJ) $(REDIS_BENCHMARK_OBJ)))
  61. all: $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_RDB_NAME) $(REDIS_CHECK_AOF_NAME)
  62. - @echo ""
  63. - @echo "Hint: It's a good idea to run 'make test' ;)"
  64. - @echo ""
  65. + #@echo ""
  66. + #@echo "Hint: It's a good idea to run 'make test' ;)"
  67. + #@echo ""
  68. Makefile.dep:
  69. -$(REDIS_CC) -MM $(ALL_SOURCES) > Makefile.dep 2> /dev/null || true