redis-quiet.patch 3.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091
  1. diff --git a/deps/Makefile b/deps/Makefile
  2. index 3bf0363d5..ea5d12cd4 100644
  3. --- a/deps/Makefile
  4. +++ b/deps/Makefile
  5. @@ -51,25 +51,25 @@ ifneq (,$(filter $(BUILD_TLS),yes module))
  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. fpconv: .make-prerequisites
  23. - @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
  24. + #@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
  25. cd fpconv && $(MAKE)
  26. .PHONY: fpconv
  27. @@ -98,7 +98,7 @@ AR=ar
  28. ARFLAGS=rc
  29. lua: .make-prerequisites
  30. - @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
  31. + #@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
  32. cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)"
  33. .PHONY: lua
  34. @@ -111,7 +111,7 @@ JEMALLOC_CONFIGURE_OPTS += --host=$(DEB_HOST_GNU_TYPE)
  35. endif
  36. jemalloc: .make-prerequisites
  37. - @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
  38. + #@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
  39. cd jemalloc && ./configure --disable-cxx --with-version=5.3.0-0-g0 --with-lg-quantum=3 --disable-cache-oblivious --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
  40. cd jemalloc && $(MAKE) lib/libjemalloc.a
  41. diff --git a/deps/jemalloc/Makefile.in b/deps/jemalloc/Makefile.in
  42. index 1193cd859..140995eb5 100644
  43. --- a/deps/jemalloc/Makefile.in
  44. +++ b/deps/jemalloc/Makefile.in
  45. @@ -496,7 +496,7 @@ $(objroot)include/jemalloc/internal/private_namespace_jet.gen.h: $(C_JET_SYMS)
  46. $(SHELL) $(srcroot)include/jemalloc/internal/private_namespace.sh $^ > $@
  47. %.h: %.gen.h
  48. - @if ! `cmp -s $< $@` ; then echo "cp $< $@"; cp $< $@ ; fi
  49. + @if ! `cmp -s $< $@` ; then cp $< $@ ; fi
  50. $(CPP_OBJS) $(CPP_PIC_OBJS) $(TESTS_CPP_OBJS): %.$(O):
  51. @mkdir -p $(@D)
  52. diff --git a/src/Makefile b/src/Makefile
  53. index ecbd2753d..737a14777 100644
  54. --- a/src/Makefile
  55. +++ b/src/Makefile
  56. @@ -116,7 +116,7 @@ endif
  57. # Override default settings if possible
  58. -include .make-settings
  59. -FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
  60. +FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) $(CPPFLAGS)
  61. FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
  62. FINAL_LIBS=-lm
  63. DEBUG=-g -ggdb
  64. @@ -355,9 +355,9 @@ REDIS_CHECK_AOF_NAME=redis-check-aof$(PROG_SUFFIX)
  65. ALL_SOURCES=$(sort $(patsubst %.o,%.c,$(REDIS_SERVER_OBJ) $(REDIS_CLI_OBJ) $(REDIS_BENCHMARK_OBJ)))
  66. all: $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_RDB_NAME) $(REDIS_CHECK_AOF_NAME) $(TLS_MODULE)
  67. - @echo ""
  68. - @echo "Hint: It's a good idea to run 'make test' ;)"
  69. - @echo ""
  70. + #@echo ""
  71. + #@echo "Hint: It's a good idea to run 'make test' ;)"
  72. + #@echo ""
  73. Makefile.dep:
  74. -$(REDIS_CC) -MM $(ALL_SOURCES) > Makefile.dep 2> /dev/null || true