Skip to content

Commit ec37dd8

Browse files
committed
redo patches for 2.52.0 release
- cheat on python runtime. - fixes the vendor grpc change. - reorder the patches with a new round of `format-patch` Signed-off-by: Lonnie Liu <lonnie@anyscale.com>
1 parent ab50e3f commit ec37dd8

10 files changed

+101
-133
lines changed

recipe/patches/0001-Disable-making-entry-scripts.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From d60aeb6f8f84ab2f30ca04701fd33d62be23857a Mon Sep 17 00:00:00 2001
1+
From 017eb9b742656d9f689ea70ded70d4cbb94ad2b2 Mon Sep 17 00:00:00 2001
22
From: Vasily Litvinov <vasilij.n.litvinov@intel.com>
33
Date: Tue, 10 Nov 2020 23:26:35 +0300
4-
Subject: [PATCH 01/11] Disable making entry scripts
4+
Subject: [PATCH 1/8] Disable making entry scripts
55

66
---
77
python/setup.py | 6 +++---
88
1 file changed, 3 insertions(+), 3 deletions(-)
99

1010
diff --git a/python/setup.py b/python/setup.py
11-
index 82a08fda81..fa2e5a6d19 100644
11+
index 7681efac52..0edbd34af5 100644
1212
--- a/python/setup.py
1313
+++ b/python/setup.py
14-
@@ -787,9 +787,9 @@ if __name__ == "__main__":
14+
@@ -806,9 +806,9 @@ if __name__ == "__main__":
1515
extras_require=setup_spec.extras,
1616
entry_points={
1717
"console_scripts": [
@@ -25,5 +25,5 @@ index 82a08fda81..fa2e5a6d19 100644
2525
},
2626
package_data={
2727
--
28-
2.39.5 (Apple Git-154)
28+
2.25.1
2929

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
From a2db157659e60dcff8805e78f955a50d2ea5fa49 Mon Sep 17 00:00:00 2001
1+
From 0807a0326ef2562448a59368a14348136886be9c Mon Sep 17 00:00:00 2001
22
From: Vasily Litvinov <vasilij.n.litvinov@intel.com>
33
Date: Fri, 9 May 2025 13:12:32 +0300
4-
Subject: [PATCH 02/11] Ignore warnings in event.cc and logging.cc
4+
Subject: [PATCH 2/8] Ignore warnings in event.cc and logging.cc
55

66
---
77
.bazelrc | 5 ++++-
88
1 file changed, 4 insertions(+), 1 deletion(-)
99

1010
diff --git a/.bazelrc b/.bazelrc
11-
index 8c2be7ea85..535b16b33a 100644
11+
index 3652a96fdf..30bd6a53ae 100644
1212
--- a/.bazelrc
1313
+++ b/.bazelrc
1414
@@ -53,13 +53,16 @@ build:windows --enable_runfiles
@@ -30,5 +30,5 @@ index 8c2be7ea85..535b16b33a 100644
3030
build:macos --per_file_copt="-\\.(asm|S)$,external/.*@-w,-Wno-error=implicit-function-declaration,-Wno-error=unused-function,-Wno-missing-template-arg-list-after-template-kw"
3131
# Ignore warnings for host tools, which we generally can't control.
3232
--
33-
2.39.5 (Apple Git-154)
33+
2.25.1
3434

recipe/patches/0003-Newer-hermetic-python.patch

Lines changed: 0 additions & 64 deletions
This file was deleted.
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
From 245f2a37850444d6248357f8091c84c0518a70a8 Mon Sep 17 00:00:00 2001
2+
From: Lonnie Liu <lonnie@anyscale.com>
3+
Date: Thu, 27 Nov 2025 02:30:45 +0000
4+
Subject: [PATCH 3/8] fake python 3.9 with python 3.12
5+
6+
Signed-off-by: Lonnie Liu <lonnie@anyscale.com>
7+
---
8+
WORKSPACE | 4 +++-
9+
1 file changed, 3 insertions(+), 1 deletion(-)
10+
11+
diff --git a/WORKSPACE b/WORKSPACE
12+
index ad4fe2ec26..a460922935 100644
13+
--- a/WORKSPACE
14+
+++ b/WORKSPACE
15+
@@ -54,8 +54,10 @@ hedron_compile_commands_setup()
16+
load("@rules_python//python:repositories.bzl", "python_register_toolchains")
17+
18+
python_register_toolchains(
19+
+ # Lie about the version, so that we do not need to change the code
20+
+ # of the entire repo.
21+
name = "python3_9",
22+
- python_version = "3.9",
23+
+ python_version = "3.12",
24+
register_toolchains = False,
25+
)
26+
27+
--
28+
2.25.1
29+

recipe/patches/0005-Vendor-grpc-1.67.1.patch renamed to recipe/patches/0004-Vendor-grpc-1.67.1.patch

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
From f77554e0a65b7ef7573c65c562796f6661e4f40c Mon Sep 17 00:00:00 2001
1+
From 3f1a2ce8fa614210366819d3126551a2efc9d58c Mon Sep 17 00:00:00 2001
22
From: Austin Morton <austin.morton@aquatic.com>
33
Date: Wed, 15 Oct 2025 16:12:56 +0000
4-
Subject: [PATCH] Vendor grpc 1.67.1
4+
Subject: [PATCH 4/8] Vendor grpc 1.67.1
55

66
Co-authored-by: Lonnie Liu <lonnie@anyscale.com>
7+
Signed-off-by: Lonnie Liu <lonnie@anyscale.com>
78
---
89
bazel/ray_deps_setup.bzl | 28 ++++++++-----------
910
.../task_event_buffer_export_event_test.cc | 2 +-
@@ -94,10 +95,10 @@ index cf2e6e7203..aa1c53e9f0 100644
9495
std::vector<SourceTypeVariant> source_types = {
9596
rpc::ExportEvent_SourceType::ExportEvent_SourceType_EXPORT_TASK};
9697
diff --git a/src/ray/gcs/tests/gcs_actor_manager_test.cc b/src/ray/gcs/tests/gcs_actor_manager_test.cc
97-
index fe38880f7c..1c488d18a7 100644
98+
index 5004c5a5b0..9f298f9b26 100644
9899
--- a/src/ray/gcs/tests/gcs_actor_manager_test.cc
99100
+++ b/src/ray/gcs/tests/gcs_actor_manager_test.cc
100-
@@ -1230,7 +1230,7 @@ TEST_F(GcsActorManagerTest, TestGetAllActorInfoFilters) {
101+
@@ -1269,7 +1269,7 @@ TEST_F(GcsActorManagerTest, TestGetAllActorInfoFilters) {
101102
request.mutable_filters()->set_actor_id(actor->GetActorID().Binary());
102103

103104
auto &reply =
@@ -106,7 +107,7 @@ index fe38880f7c..1c488d18a7 100644
106107
gcs_actor_manager_->HandleGetAllActorInfo(request, &reply, callback);
107108
ASSERT_EQ(reply.actor_table_data().size(), 1);
108109
ASSERT_EQ(reply.total(), 1 + num_other_actors);
109-
@@ -1243,7 +1243,7 @@ TEST_F(GcsActorManagerTest, TestGetAllActorInfoFilters) {
110+
@@ -1282,7 +1282,7 @@ TEST_F(GcsActorManagerTest, TestGetAllActorInfoFilters) {
110111
request.mutable_filters()->set_job_id(job_id.Binary());
111112

112113
auto &reply =
@@ -115,7 +116,7 @@ index fe38880f7c..1c488d18a7 100644
115116
gcs_actor_manager_->HandleGetAllActorInfo(request, &reply, callback);
116117
ASSERT_EQ(reply.actor_table_data().size(), 1);
117118
ASSERT_EQ(reply.num_filtered(), num_other_actors);
118-
@@ -1255,7 +1255,7 @@ TEST_F(GcsActorManagerTest, TestGetAllActorInfoFilters) {
119+
@@ -1294,7 +1294,7 @@ TEST_F(GcsActorManagerTest, TestGetAllActorInfoFilters) {
119120
request.mutable_filters()->set_state(rpc::ActorTableData::ALIVE);
120121

121122
auto &reply =
@@ -124,7 +125,7 @@ index fe38880f7c..1c488d18a7 100644
124125
gcs_actor_manager_->HandleGetAllActorInfo(request, &reply, callback);
125126
ASSERT_EQ(reply.actor_table_data().size(), 1);
126127
ASSERT_EQ(reply.num_filtered(), num_other_actors);
127-
@@ -1268,7 +1268,7 @@ TEST_F(GcsActorManagerTest, TestGetAllActorInfoFilters) {
128+
@@ -1307,7 +1307,7 @@ TEST_F(GcsActorManagerTest, TestGetAllActorInfoFilters) {
128129
request.mutable_filters()->set_job_id(job_id.Binary());
129130

130131
auto &reply =
@@ -133,7 +134,7 @@ index fe38880f7c..1c488d18a7 100644
133134
gcs_actor_manager_->HandleGetAllActorInfo(request, &reply, callback);
134135
ASSERT_EQ(reply.actor_table_data().size(), 1);
135136
ASSERT_EQ(reply.num_filtered(), num_other_actors);
136-
@@ -1279,7 +1279,7 @@ TEST_F(GcsActorManagerTest, TestGetAllActorInfoFilters) {
137+
@@ -1318,7 +1318,7 @@ TEST_F(GcsActorManagerTest, TestGetAllActorInfoFilters) {
137138
request.mutable_filters()->set_job_id(job_id.Binary());
138139

139140
auto &reply =
@@ -142,7 +143,7 @@ index fe38880f7c..1c488d18a7 100644
142143
gcs_actor_manager_->HandleGetAllActorInfo(request, &reply, callback);
143144
ASSERT_EQ(reply.num_filtered(), num_other_actors + 1);
144145
ASSERT_EQ(reply.actor_table_data().size(), 0);
145-
@@ -1302,14 +1302,14 @@ TEST_F(GcsActorManagerTest, TestGetAllActorInfoLimit) {
146+
@@ -1341,14 +1341,14 @@ TEST_F(GcsActorManagerTest, TestGetAllActorInfoLimit) {
146147
{
147148
rpc::GetAllActorInfoRequest request;
148149
auto &reply =
@@ -160,11 +161,11 @@ index fe38880f7c..1c488d18a7 100644
160161
ASSERT_EQ(reply_2.actor_table_data().size(), 2);
161162
ASSERT_EQ(reply_2.total(), 3);
162163
diff --git a/src/ray/rpc/server_call.h b/src/ray/rpc/server_call.h
163-
index 0d0779525e..c5dc59b21f 100644
164+
index 2da3ce00b0..7db8dd68b6 100644
164165
--- a/src/ray/rpc/server_call.h
165166
+++ b/src/ray/rpc/server_call.h
166-
@@ -181,7 +181,7 @@ class ServerCallImpl : public ServerCall {
167-
cluster_id_(cluster_id),
167+
@@ -190,7 +190,7 @@ class ServerCallImpl : public ServerCall {
168+
auth_token_(auth_token),
168169
start_time_(0),
169170
record_metrics_(record_metrics) {
170171
- reply_ = google::protobuf::Arena::CreateMessage<Reply>(&arena_);

recipe/patches/0006-remove-stdlib-libc-from-.bazelrc.patch renamed to recipe/patches/0005-remove-stdlib-libc-from-.bazelrc.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From 99ed69a76a386731fef553b63300cbb9b2426366 Mon Sep 17 00:00:00 2001
1+
From a119f7aa3ca4db5960e57a01900897d9bfb35311 Mon Sep 17 00:00:00 2001
22
From: Matti Picus <matti.picus@gmail.com>
33
Date: Thu, 9 May 2024 05:13:50 +1000
4-
Subject: [PATCH 06/11] remove stdlib=libc++ from .bazelrc
4+
Subject: [PATCH 5/8] remove stdlib=libc++ from .bazelrc
55

66
---
77
.bazelrc | 6 +++---
88
1 file changed, 3 insertions(+), 3 deletions(-)
99

1010
diff --git a/.bazelrc b/.bazelrc
11-
index 535b16b33a..20d310e616 100644
11+
index 30bd6a53ae..20e20bcdda 100644
1212
--- a/.bazelrc
1313
+++ b/.bazelrc
14-
@@ -106,9 +106,9 @@ build:windows-debug --cxxopt="-D_ITERATOR_DEBUG_LEVEL=2"
14+
@@ -104,9 +104,9 @@ build:windows-debug --cxxopt="-D_ITERATOR_DEBUG_LEVEL=2"
1515

1616
# LLVM (clang & libc++) build flags common across Linux installations and systems.
1717
# On Ubuntu, the remaining configurations can be generated by running ci/env/install-llvm-binaries.sh
@@ -25,5 +25,5 @@ index 535b16b33a..20d310e616 100644
2525
build:llvm --action_env=BAZEL_LINKOPTS=-lm:-pthread
2626
build:llvm --define force_libcpp=enabled
2727
--
28-
2.39.5 (Apple Git-154)
28+
2.25.1
2929

recipe/patches/0007-patch-protobuf-use-of-nan-on-windows.patch renamed to recipe/patches/0006-patch-protobuf-use-of-nan-on-windows.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
From 3570056af7fce8b748e1f18962453eb4130f8bdb Mon Sep 17 00:00:00 2001
1+
From 5ad7f307fe1e28b8934109a736168d5c321c6d93 Mon Sep 17 00:00:00 2001
22
From: Matti Picus <matti.picus@gmail.com>
33
Date: Wed, 5 Feb 2025 22:39:59 +1100
4-
Subject: [PATCH 07/11] patch protobuf use of nan on windows
4+
Subject: [PATCH 6/8] patch protobuf use of nan on windows
55

66
---
7-
bazel/ray_deps_setup.bzl | 4 +++
7+
bazel/ray_deps_setup.bzl | 3 ++
88
.../patches/protobuf-windows-const-nan.patch | 32 +++++++++++++++++++
9-
2 files changed, 36 insertions(+)
9+
2 files changed, 35 insertions(+)
1010
create mode 100644 thirdparty/patches/protobuf-windows-const-nan.patch
1111

1212
diff --git a/bazel/ray_deps_setup.bzl b/bazel/ray_deps_setup.bzl
13-
index ce365f9a34..344e4255ff 100644
13+
index 5b8d351a97..c3bfb77d6f 100644
1414
--- a/bazel/ray_deps_setup.bzl
1515
+++ b/bazel/ray_deps_setup.bzl
1616
@@ -96,6 +96,9 @@ def ray_deps_setup():
@@ -25,7 +25,7 @@ index ce365f9a34..344e4255ff 100644
2525
# NOTE(lingxuan.zlx): 3rd party dependencies could be accessed, so it suggests
2626
diff --git a/thirdparty/patches/protobuf-windows-const-nan.patch b/thirdparty/patches/protobuf-windows-const-nan.patch
2727
new file mode 100644
28-
index 0000000000..4c4cab48f4
28+
index 0000000000..566cabbd5c
2929
--- /dev/null
3030
+++ b/thirdparty/patches/protobuf-windows-const-nan.patch
3131
@@ -0,0 +1,32 @@
@@ -62,5 +62,5 @@ index 0000000000..4c4cab48f4
6262
+ bool UPB_PRIVATE(_upb_Message_Realloc)(struct upb_Message* msg, size_t need,
6363
+ upb_Arena* a) {
6464
--
65-
2.39.5 (Apple Git-154)
65+
2.25.1
6666

recipe/patches/0008-patch-zlib-in-prometheus-cpp-and-boost.patch renamed to recipe/patches/0007-patch-zlib-in-prometheus-cpp-and-boost.patch

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1-
From 01f9e567d0c412860b69213e1195c5c131125972 Mon Sep 17 00:00:00 2001
1+
From d37f77af523d3f20dd34fe90a90e6a0aaea8e9d7 Mon Sep 17 00:00:00 2001
22
From: Matti Picus <matti.picus@gmail.com>
33
Date: Fri, 29 Aug 2025 00:16:11 +0300
4-
Subject: [PATCH 08/11] patch zlib in prometheus-cpp and boost
4+
Subject: [PATCH 7/8] patch zlib in prometheus-cpp and boost
55

66
---
7-
bazel/ray_deps_setup.bzl | 1 +
7+
bazel/ray_deps_setup.bzl | 2 ++
8+
thirdparty/patches/boost-mirrors.patch | 13 +++++++++++++
89
thirdparty/patches/boost-zlib-fdopen.patch | 16 ++++++++++++++++
9-
2 files changed, 17 insertions(+)
10+
3 files changed, 31 insertions(+)
11+
create mode 100644 thirdparty/patches/boost-mirrors.patch
1012
create mode 100644 thirdparty/patches/boost-zlib-fdopen.patch
1113

1214
diff --git a/bazel/ray_deps_setup.bzl b/bazel/ray_deps_setup.bzl
13-
index 344e4255ff..5e78d42322 100644
15+
index c3bfb77d6f..327ec8d343 100644
1416
--- a/bazel/ray_deps_setup.bzl
1517
+++ b/bazel/ray_deps_setup.bzl
16-
@@ -174,6 +174,8 @@ def ray_deps_setup():
18+
@@ -173,6 +173,8 @@ def ray_deps_setup():
1719
sha256 = "490d11425393eed068966a4990ead1ff07c658f823fd982fddac67006ccc44ab",
1820
patches = [
1921
"//thirdparty/patches:boost-headers.patch",
@@ -22,9 +24,28 @@ index 344e4255ff..5e78d42322 100644
2224
],
2325
patch_args = ["-p1"],
2426
)
27+
diff --git a/thirdparty/patches/boost-mirrors.patch b/thirdparty/patches/boost-mirrors.patch
28+
new file mode 100644
29+
index 0000000000..77c766c1b0
30+
--- /dev/null
31+
+++ b/thirdparty/patches/boost-mirrors.patch
32+
@@ -0,0 +1,13 @@
33+
+diff --git a/boost/boost.bzl b/boost/boost.bzl
34+
+index fc56a14..e54c4e7 100644
35+
+--- a/boost/boost.bzl
36+
++++ b/boost/boost.bzl
37+
+@@ -178,7 +178,7 @@ def boost_deps():
38+
+ ]
39+
+ )
40+
+
41+
+- SOURCEFORGE_MIRRORS = ["cfhcable", "superb-sea2", "cytranet", "iweb", "gigenet", "ayera", "astuteinternet", "pilotfiber", "svwh"]
42+
++ SOURCEFORGE_MIRRORS = ["cytranet-dal", "gigenet", "psychz"]
43+
+
44+
+ maybe(
45+
+ http_archive,
2546
diff --git a/thirdparty/patches/boost-zlib-fdopen.patch b/thirdparty/patches/boost-zlib-fdopen.patch
2647
new file mode 100644
27-
index 0000000000..76b2585f96
48+
index 0000000000..8f78a35768
2849
--- /dev/null
2950
+++ b/thirdparty/patches/boost-zlib-fdopen.patch
3051
@@ -0,0 +1,16 @@
@@ -44,25 +65,6 @@ index 0000000000..76b2585f96
4465
+
4566
+
4667
+
47-
diff --git a/thirdparty/patches/boost-mirrors.patch b/thirdparty/patches/boost-mirrors.patch
48-
new file mode 100644
49-
index 0000000000..77c766c1b0
50-
--- /dev/null
51-
+++ b/thirdparty/patches/boost-mirrors.patch
52-
@@ -0,0 +1,13 @@
53-
+diff --git a/boost/boost.bzl b/boost/boost.bzl
54-
+index fc56a14..e54c4e7 100644
55-
+--- a/boost/boost.bzl
56-
++++ b/boost/boost.bzl
57-
+@@ -178,7 +178,7 @@ def boost_deps():
58-
+ ]
59-
+ )
60-
+
61-
+- SOURCEFORGE_MIRRORS = ["cfhcable", "superb-sea2", "cytranet", "iweb", "gigenet", "ayera", "astuteinternet", "pilotfiber", "svwh"]
62-
++ SOURCEFORGE_MIRRORS = ["cytranet-dal", "gigenet", "psychz"]
63-
+
64-
+ maybe(
65-
+ http_archive,
6668
--
67-
2.39.5 (Apple Git-154)
69+
2.25.1
6870

0 commit comments

Comments
 (0)