collapse redis patches into one

recipe/patches/0001-Redis-deps-now-build-but-do-not-link.patch

@@ -1,17 +1,18 @@
-From def926ffdcac119f4c678914a85e699f51822c4c Mon Sep 17 00:00:00 2001
+From eaff53caa7fe8dc88b767a690f6ec5a62f651ece Mon Sep 17 00:00:00 2001
 From: Vasily Litvinov <[email protected]>
 Date: Fri, 3 Dec 2021 10:46:36 -0800
 Subject: [PATCH 1/5] Redis deps now build but do not link
 
 Signed-off-by: Vasily Litvinov <[email protected]>
 Signed-off-by: Gregory Shimansky <[email protected]>
 Signed-off-by: Jiajun Yao <[email protected]>
+Signed-off-by: H. Vetinari <[email protected]>
 ---
- bazel/BUILD.redis                      | 13 ++++-
- bazel/ray_deps_setup.bzl               |  1 +
- thirdparty/patches/redis-deps-ar.patch | 75 ++++++++++++++++++++++++++
- 3 files changed, 87 insertions(+), 2 deletions(-)
- create mode 100644 thirdparty/patches/redis-deps-ar.patch
+ bazel/BUILD.redis                             | 13 ++-
+ bazel/ray_deps_setup.bzl                      |  3 +-
+ ...01-keep-redis-quiet-and-override-AR.patch} | 79 ++++++++++++++++---
+ 3 files changed, 81 insertions(+), 14 deletions(-)
+ rename thirdparty/patches/{redis-quiet.patch => 0001-keep-redis-quiet-and-override-AR.patch} (53%)
 
 diff --git a/bazel/BUILD.redis b/bazel/BUILD.redis
 index 9edccf578..60e070028 100644
@@ -49,76 +50,128 @@ index 9edccf578..60e070028 100644
      tags = ["local"],
  )
 diff --git a/bazel/ray_deps_setup.bzl b/bazel/ray_deps_setup.bzl
-index fd844d66d..64799185c 100644
+index fd844d66d..d1cb6d8df 100644
 --- a/bazel/ray_deps_setup.bzl
 +++ b/bazel/ray_deps_setup.bzl
-@@ -103,6 +103,7 @@ def ray_deps_setup():
+@@ -98,11 +98,10 @@ def ray_deps_setup():
+     auto_http_archive(
+         name = "com_github_antirez_redis",
+         build_file = "@com_github_ray_project_ray//bazel:BUILD.redis",
+-        patch_args = ["-p1"],
+         url = "https://github.com/redis/redis/archive/refs/tags/7.0.5.tar.gz",
          sha256 = "40827fcaf188456ad9b3be8e27a4f403c43672b6bb6201192dc15756af6f1eae",
          patches = [
-             "@com_github_ray_project_ray//thirdparty/patches:redis-quiet.patch",
-+            "@com_github_ray_project_ray//thirdparty/patches:redis-deps-ar.patch",
+-            "@com_github_ray_project_ray//thirdparty/patches:redis-quiet.patch",
++            "@com_github_ray_project_ray//thirdparty/patches:0001-keep-redis-quiet-and-override-AR.patch",
          ],
          workspace_file_content = 'workspace(name = "com_github_antirez_redis")'
      )
-diff --git a/thirdparty/patches/redis-deps-ar.patch b/thirdparty/patches/redis-deps-ar.patch
-new file mode 100644
-index 000000000..f778e26f4
---- /dev/null
-+++ b/thirdparty/patches/redis-deps-ar.patch
-@@ -0,0 +1,75 @@
-+From 3b634ca40c7876d58d571a6d99780558c791d5e3 Mon Sep 17 00:00:00 2001
-+From: Vasily Litvinov <[email protected]>
-+Date: Thu, 11 Mar 2021 13:09:26 +0300
-+Subject: [PATCH] Enable overriding AR and RANLIB
+diff --git a/thirdparty/patches/redis-quiet.patch b/thirdparty/patches/0001-keep-redis-quiet-and-override-AR.patch
+similarity index 53%
+rename from thirdparty/patches/redis-quiet.patch
+rename to thirdparty/patches/0001-keep-redis-quiet-and-override-AR.patch
+index d03438759..27c01310e 100644
+--- a/thirdparty/patches/redis-quiet.patch
++++ b/thirdparty/patches/0001-keep-redis-quiet-and-override-AR.patch
+@@ -1,14 +1,45 @@
++From 10feb7a20122e021efb27d3eebcf55424f3c8d55 Mon Sep 17 00:00:00 2001
++From: mehrdadn <[email protected]>
++Date: Tue, 5 May 2020 10:47:49 -0700
++Subject: [PATCH] keep redis quiet and override AR
++
++Patch to keep redis quiet maintained by upstream ray team at
++https://github.com/ray-project/ray/blob/master/thirdparty/patches/redis-quiet.patch
++
++Extended for conda-forge to enable overriding of AR and RANLIB by:
 +
 +Signed-off-by: Vasily Litvinov <[email protected]>
 +Signed-off-by: Matti Picus <[email protected]>
++Signed-off-by: H. Vetinari <[email protected]>
 +---
-+ deps/Makefile | 9 +++++----
-+ src/Makefile  | 5 ++++-
-+ 2 files changed, 9 insertions(+), 5 deletions(-)
++ deps/Makefile             | 20 +++++++++++---------
++ deps/jemalloc/Makefile.in |  2 +-
++ src/Makefile              | 13 ++++++++-----
++ 3 files changed, 20 insertions(+), 15 deletions(-)
 +
-+diff --git deps/Makefile deps/Makefile
-+index 0c13eea..96ee618 100644
-+--- deps/Makefile
-++++ deps/Makefile
-+@@ -10,6 +10,9 @@ SRCCOLOR="\033[33m"
-+ BINCOLOR="\033[37;1m"
+ diff --git a/deps/Makefile b/deps/Makefile
+-index 8592e17..0c13eea 100644
++index 8592e1766..8089693e0 100644
+ --- a/deps/Makefile
+ +++ b/deps/Makefile
+-@@ -49,19 +49,19 @@ ifeq ($(BUILD_TLS),yes)
++@@ -11,6 +11,10 @@ BINCOLOR="\033[37;1m"
 + MAKECOLOR="\033[32;1m"
 + ENDCOLOR="\033[0m"
++ 
 ++AR=ar
 ++ARFLAGS=rcu
 ++RANLIB=ranlib
-+ 
+++
 + default:
 + 	@echo "Explicit target required"
-+@@ -50,7 +53,7 @@ endif
 + 
-+ hiredis: .make-prerequisites
-+ 	#@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
++@@ -49,19 +53,19 @@ ifeq ($(BUILD_TLS),yes)
+  endif
+
+  hiredis: .make-prerequisites
+ -	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
 +-	cd hiredis && $(MAKE) static $(HIREDIS_MAKE_FLAGS)
+ +	#@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
+- 	cd hiredis && $(MAKE) static $(HIREDIS_MAKE_FLAGS)
 ++	cd hiredis && $(MAKE) static $(HIREDIS_MAKE_FLAGS) AR="$(AR)"
-+ 
-+ .PHONY: hiredis
-+ 
-+@@ -81,12 +84,10 @@ endif
+
+  .PHONY: hiredis
+
+@@ -25,16 +56,22 @@ index 8592e17..0c13eea 100644
+  	cd hdr_histogram && $(MAKE)
+
+  .PHONY: hdr_histogram
+-@@ -85,7 +85,7 @@ AR=ar
+- ARFLAGS=rc
++@@ -81,12 +85,10 @@ endif
 + # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
 + # challenging to cross-compile lua (and redis).  These defines make it easier
 + # to fit redis into cross-compilation environments, which typically set AR.
 +-AR=ar
 +-ARFLAGS=rc
-+ 
-+ lua: .make-prerequisites
-+ 	#@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
+  
+  lua: .make-prerequisites
+ -	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
 +-	cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)"
+ +	#@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
+- 	cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)"
 ++	cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)" RANLIB="$(RANLIB)"
+
+  .PHONY: lua
+-@@ -98,7 +98,7 @@ JEMALLOC_CONFIGURE_OPTS += --host=$(DEB_HOST_GNU_TYPE)
 + 
-+ .PHONY: lua
-+ 
-+diff --git src/Makefile src/Makefile
-+index 218543f..23fad2b 100644
-+--- src/Makefile
-++++ src/Makefile
++@@ -98,7 +100,7 @@ JEMALLOC_CONFIGURE_OPTS += --host=$(DEB_HOST_GNU_TYPE)
+  endif
+
+  jemalloc: .make-prerequisites
+@@ -44,7 +81,7 @@ index 8592e17..0c13eea 100644
+  	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
+
+ diff --git a/deps/jemalloc/Makefile.in b/deps/jemalloc/Makefile.in
+-index 7128b00..da8e429 100644
++index 7128b007e..da8e4299f 100644
+ --- a/deps/jemalloc/Makefile.in
+ +++ b/deps/jemalloc/Makefile.in
+ @@ -406,7 +406,7 @@ $(objroot)include/jemalloc/internal/private_namespace_jet.gen.h: $(C_JET_SYMS)
+@@ -57,7 +94,7 @@ index 7128b00..da8e429 100644
+  $(CPP_OBJS) $(CPP_PIC_OBJS) $(TESTS_CPP_OBJS): %.$(O):
+  	@mkdir -p $(@D)
+ diff --git a/src/Makefile b/src/Makefile
+-index e4f7d90..704d4b4 100644
++index e4f7d9068..82b6f7cca 100644
+ --- a/src/Makefile
+ +++ b/src/Makefile
+ @@ -115,7 +115,7 @@ endif
+@@ -69,7 +106,17 @@ index e4f7d90..704d4b4 100644
+  FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
+  FINAL_LIBS=-lm
+  DEBUG=-g -ggdb
+-@@ -326,9 +326,9 @@ REDIS_CHECK_AOF_NAME=redis-check-aof$(PROG_SUFFIX)
 +@@ -307,6 +307,9 @@ BINCOLOR="\033[37;1m"
 + MAKECOLOR="\033[32;1m"
 + ENDCOLOR="\033[0m"
@@ -129,6 +182,14 @@ index 000000000..f778e26f4
 + ifndef V
 + QUIET_CC = @printf '    %b %b\n' $(CCCOLOR)CC$(ENDCOLOR) $(SRCCOLOR)$@$(ENDCOLOR) 1>&2;
 + QUIET_GEN = @printf '    %b %b\n' $(CCCOLOR)GEN$(ENDCOLOR) $(SRCCOLOR)$@$(ENDCOLOR) 1>&2;
++@@ -326,9 +329,9 @@ REDIS_CHECK_AOF_NAME=redis-check-aof$(PROG_SUFFIX)
+  ALL_SOURCES=$(sort $(patsubst %.o,%.c,$(REDIS_SERVER_OBJ) $(REDIS_CLI_OBJ) $(REDIS_BENCHMARK_OBJ)))
+
+  all: $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_RDB_NAME) $(REDIS_CHECK_AOF_NAME)
+@@ -82,3 +129,15 @@ index e4f7d90..704d4b4 100644
+
+  Makefile.dep:
+  	-$(REDIS_CC) -MM $(ALL_SOURCES) > Makefile.dep 2> /dev/null || true
 +@@ -352,7 +355,7 @@ persist-settings: distclean
 + 	echo REDIS_LDFLAGS=$(REDIS_LDFLAGS) >> .make-settings
 + 	echo PREV_FINAL_CFLAGS=$(FINAL_CFLAGS) >> .make-settings
@@ -139,7 +200,7 @@ index 000000000..f778e26f4
 + .PHONY: persist-settings
 + 
 +-- 
-+2.11.0
++2.38.1.windows.1
 +
 -- 
 2.38.1.windows.1

recipe/patches/0002-Disable-making-non-core-entry-scripts.patch

@@ -1,4 +1,4 @@
-From 3aa3629ce4eb95001401b3b9a81ac896f7258b1c Mon Sep 17 00:00:00 2001
+From e5e5a033057706588e145138978b03bb794a73bd Mon Sep 17 00:00:00 2001
 From: Vasily Litvinov <[email protected]>
 Date: Tue, 10 Nov 2020 23:26:35 +0300
 Subject: [PATCH 2/5] Disable making non-core entry scripts

recipe/patches/0003-Remove-all-dependencies-from-setup.py.patch

@@ -1,4 +1,4 @@
-From c8e20362db9b76134ee1657635e34d97d2df75ca Mon Sep 17 00:00:00 2001
+From ccfe2d9f35c60a7a774a6ece15640680ef04b5dd Mon Sep 17 00:00:00 2001
 From: Kai Fricke <[email protected]>
 Date: Fri, 3 Dec 2021 10:55:23 -0800
 Subject: [PATCH 3/5] Remove all dependencies from setup.py

recipe/patches/0004-Ignore-warnings-in-event.cc-and-logging.cc.patch

@@ -1,4 +1,4 @@
-From 7dd66d73a8fd1066eff55bb3a9369f461fe20f64 Mon Sep 17 00:00:00 2001
+From 0b7c4293f3584c086ee124240630e3c642106ea9 Mon Sep 17 00:00:00 2001
 From: Vasily Litvinov <[email protected]>
 Date: Fri, 3 Dec 2021 10:59:10 -0800
 Subject: [PATCH 4/5] Ignore warnings in event.cc and logging.cc

recipe/patches/0005-Add-bazel-linkopts-libs.patch

@@ -1,4 +1,4 @@
-From cc7ed1a82240b750eb6f8e4acefce402c1e05ce9 Mon Sep 17 00:00:00 2001
+From 4aa1424eb52cae11b4a52407bd5631814bb883f5 Mon Sep 17 00:00:00 2001
 From: Kai Fricke <[email protected]>
 Date: Fri, 3 Dec 2021 11:04:33 -0800
 Subject: [PATCH 5/5] Add bazel linkopts/libs