Skip to content

Commit

Permalink
rebase patch from 1.57.x branch after all
Browse files Browse the repository at this point in the history
  • Loading branch information
h-vetinari committed Sep 28, 2023
1 parent 6995cf9 commit 805e6ca
Show file tree
Hide file tree
Showing 11 changed files with 105 additions and 18 deletions.
2 changes: 2 additions & 0 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ source:
- patches/0008-Build-Shared-builds-on-windows-34103.patch # [win]
# unbreak CMake integration
- patches/0009-don-t-use-find_dependency-for-protobuf.patch
# get gRPC_BUILD_TESTS=ON to build
- patches/0010-add-missing-linkages-for-gRPC_BUILD_TESTS-ON.patch
- git_url: https://github.com/google/benchmark.git
git_rev: 015d1a091af6937488242b70121858bce8fd40e9
folder: third_party/benchmark
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0001-windows-ssl-lib-names.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From e45462e61a5b4cff0a6f2d4d154cc71bfc744c7c Mon Sep 17 00:00:00 2001
From 40895fe910e113622cd711eb2573bd988702d9a9 Mon Sep 17 00:00:00 2001
From: Jonathan Helmus <jjhelmus@gmail.com>
Date: Mon, 17 Feb 2020 15:45:06 -0600
Subject: [PATCH 1/9] windows ssl lib names
Subject: [PATCH 01/10] windows ssl lib names

Co-Authored-By: Julien Schueller <schueller@phimeca.com>
Co-Authored-By: Nicholas Bollweg <nick.bollweg@gmail.com>
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0002-fix-win-setup-cmds.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From a7a8cb6163318b558229fc04a51f2e18307d9e16 Mon Sep 17 00:00:00 2001
From a12ec38d2ef7eece1ef15929be8845b0bd0d5f9a Mon Sep 17 00:00:00 2001
From: Mike Sarahan <msarahan@gmail.com>
Date: Tue, 18 Feb 2020 13:53:05 -0600
Subject: [PATCH 2/9] fix win setup cmds
Subject: [PATCH 02/10] fix win setup cmds

Co-Authored-By: Julien Schueller <schueller@phimeca.com>
Co-Authored-By: Nicholas Bollweg <nick.bollweg@gmail.com>
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0003-Link-against-grpc.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From e6a2c35ad6e1f9250c2b1ab499bf0daefdf230c4 Mon Sep 17 00:00:00 2001
From e9fd86a47808f5c5f8690b9065f4487783cc81cf Mon Sep 17 00:00:00 2001
From: Marius van Niekerk <marius.v.niekerk@gmail.com>
Date: Mon, 13 Jun 2022 17:13:07 -0400
Subject: [PATCH 3/9] Link against grpc
Subject: [PATCH 03/10] Link against grpc

---
setup.py | 10 ++++++++++
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0004-force-protoc-executable.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From a646d6fd188d206f53498e8dea82054f2421cc78 Mon Sep 17 00:00:00 2001
From a6fc955d0698cd4836a1b10ed539c22c65d0a4d7 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <uwe.korn@quantco.com>
Date: Fri, 11 Sep 2020 14:20:04 +0200
Subject: [PATCH 4/9] force protoc executable
Subject: [PATCH 04/10] force protoc executable

---
cmake/protobuf.cmake | 17 ++---------------
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0005-switch-to-C-17-for-grpcio.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From a4a31c3c95506c9201dcc265f024736275c4f731 Mon Sep 17 00:00:00 2001
From 785fa205ca38f8b722f4e6f2a1d5e655bf117d07 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Sat, 3 Sep 2022 19:23:15 +0200
Subject: [PATCH 5/9] switch to C++17 for grpcio
Subject: [PATCH 05/10] switch to C++17 for grpcio

---
setup.py | 7 ++++---
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0006-fix-abseil-setup.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From c036c15acdf4dea186531f7c2983267053f4a76e Mon Sep 17 00:00:00 2001
From 09e59a6c9766c91c8a8f94f190ec5b4841bef16f Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Sun, 4 Sep 2022 14:34:52 +0200
Subject: [PATCH 6/9] fix abseil setup
Subject: [PATCH 06/10] fix abseil setup

---
setup.py | 15 +++++++++++----
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 5308ac4733e1f81dde22b8401b78725196c4ba89 Mon Sep 17 00:00:00 2001
From d51b64ef82c4e2b7e6c20580320fc2369199abde Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Tue, 23 Aug 2022 11:45:20 +0200
Subject: [PATCH 7/9] mark linkage of c-ares/re2/zlib as private
Subject: [PATCH 07/10] mark linkage of c-ares/re2/zlib as private

See also: https://github.com/grpc/grpc/issues/30838

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 8f1950aa57815f89fcce2eff45bbdab2b3c7546c Mon Sep 17 00:00:00 2001
From 9b6cdcda6af8fb47370a6deb58946712baaab4bf Mon Sep 17 00:00:00 2001
From: h-vetinari <h.vetinari@gmx.com>
Date: Wed, 13 Sep 2023 03:12:36 +1100
Subject: [PATCH 8/9] [Build] Shared builds on windows (#34103)
Subject: [PATCH 08/10] [Build] Shared builds on windows (#34103)

Towards https://github.com/grpc/grpc/issues/33032,

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From b2169fc42fe09654dc2c06fd46d4e2869d391353 Mon Sep 17 00:00:00 2001
From f7dc32ad90c8ecfdab093a38db55123610a07570 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Fri, 9 Jun 2023 22:16:09 +1100
Subject: [PATCH 9/9] don't use find_dependency for protobuf
Subject: [PATCH 09/10] don't use find_dependency for protobuf

---
cmake/protobuf.cmake | 2 +-
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
From ff91cc276e680334fa45cb9318787251c1d81b68 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Tue, 26 Sep 2023 18:25:54 +1100
Subject: [PATCH 10/10] add missing linkages for gRPC_BUILD_TESTS=ON

---
CMakeLists.txt | 9 +++++++++
1 file changed, 9 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7ffebb33e..f5ea7fa458 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6543,6 +6543,7 @@ target_include_directories(authorization_matchers_test
)

target_link_libraries(authorization_matchers_test
+ ${_gRPC_RE2_LIBRARIES}
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
grpc_test_util
@@ -12766,6 +12767,7 @@ target_include_directories(grpc_authorization_engine_test
)

target_link_libraries(grpc_authorization_engine_test
+ ${_gRPC_RE2_LIBRARIES}
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
grpc_test_util
@@ -14406,6 +14408,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
)

target_link_libraries(httpcli_test
+ ${_gRPC_CARES_LIBRARIES}
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
grpc++_test_util
@@ -15749,6 +15752,7 @@ target_include_directories(matchers_test
)

target_link_libraries(matchers_test
+ ${_gRPC_RE2_LIBRARIES}
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
grpc_test_util
@@ -18900,6 +18904,7 @@ target_include_directories(resolve_address_using_ares_resolver_test
)

target_link_libraries(resolve_address_using_ares_resolver_test
+ ${_gRPC_CARES_LIBRARIES}
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
grpc_test_util
@@ -18991,6 +18996,7 @@ target_include_directories(resolve_address_using_native_resolver_test
)

target_link_libraries(resolve_address_using_native_resolver_test
+ ${_gRPC_CARES_LIBRARIES}
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
grpc_test_util
@@ -26539,6 +26545,7 @@ target_include_directories(xds_common_types_test
)

target_link_libraries(xds_common_types_test
+ ${_gRPC_RE2_LIBRARIES}
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
grpc++
@@ -26797,6 +26804,7 @@ target_include_directories(xds_credentials_test
)

target_link_libraries(xds_credentials_test
+ ${_gRPC_RE2_LIBRARIES}
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
grpc_test_util
@@ -27948,6 +27956,7 @@ target_include_directories(xds_listener_resource_type_test
)

target_link_libraries(xds_listener_resource_type_test
+ ${_gRPC_RE2_LIBRARIES}
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
grpc++

0 comments on commit 805e6ca

Please sign in to comment.