Skip to content

Commit

Permalink
add patch for missing linkage of test targets
Browse files Browse the repository at this point in the history
  • Loading branch information
h-vetinari committed Sep 26, 2023
1 parent 026dc57 commit 55eeb91
Show file tree
Hide file tree
Showing 17 changed files with 38 additions and 15 deletions.
2 changes: 2 additions & 0 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ source:
# backport grpc/grpc#31256 & grpc/grpc#34131
- patches/0014-OpenSSL-Support-for-OpenSSL-3-31256.patch
- patches/0015-Testing-Disable-failing-OpenSSL-Test-34131.patch
# get gRPC_BUILD_TESTS=ON to build
- patches/0016-add-missing-linkages-for-tests.patch
- git_url: https://github.com/google/benchmark.git
git_rev: 015d1a091af6937488242b70121858bce8fd40e9
folder: third_party/benchmark
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0001-windows-ssl-lib-names.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 2a1c3cd2cbc0f7438b08910056be8c633b7d2c61 Mon Sep 17 00:00:00 2001
From: Jonathan Helmus <jjhelmus@gmail.com>
Date: Mon, 17 Feb 2020 15:45:06 -0600
Subject: [PATCH 01/15] windows ssl lib names
Subject: [PATCH 01/16] windows ssl lib names

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

Co-Authored-By: Julien Schueller <schueller@phimeca.com>
Co-Authored-By: Nicholas Bollweg <nick.bollweg@gmail.com>
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0003-Link-against-grpc.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 2fccd9b300634cb6844dd9c91ac45c2466b26069 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 03/15] Link against grpc
Subject: [PATCH 03/16] Link against grpc

---
setup.py | 10 ++++++++++
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0004-force-protoc-executable.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From ae5afd005e89615a8ad5d2065b7b974f9ac261a9 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 04/15] force protoc executable
Subject: [PATCH 04/16] force protoc executable

---
cmake/protobuf.cmake | 17 ++---------------
Expand Down
2 changes: 1 addition & 1 deletion 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 b49d9e16749265cb3a7611a1b9f43e4967cf9a5b 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 05/15] switch to C++17 for grpcio
Subject: [PATCH 05/16] switch to C++17 for grpcio

---
setup.py | 7 ++++---
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0006-fix-abseil-setup.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From d625e157ff1375628d9e1d8473e4a2d22884898a 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 06/15] fix abseil setup
Subject: [PATCH 06/16] fix abseil setup

---
setup.py | 15 +++++++++++----
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From dbc83253344b9edc5cd060636bf4c8e4816c05e7 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 07/15] mark linkage of c-ares/re2/zlib as private
Subject: [PATCH 07/16] 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 e172eb17c4a3b2d156c50a78575e2df5b5443832 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Sat, 22 Oct 2022 01:21:56 -0500
Subject: [PATCH 08/15] add {GPR,GRPC,GRPCXX,UBP}_DLL mechanism for missing
Subject: [PATCH 08/16] add {GPR,GRPC,GRPCXX,UBP}_DLL mechanism for missing
symbols on windows

Co-Authored-By: "H. Vetinari" <h.vetinari@gmx.com>
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0009-fix-support_enabled-for-windows.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 8ea954583dde6b4f78fb73347385c831c28db34f Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Sat, 22 Oct 2022 02:21:08 -0500
Subject: [PATCH 09/15] fix support_enabled for windows
Subject: [PATCH 09/16] fix support_enabled for windows

---
src/core/lib/gprpp/fork.cc | 12 ++++++++++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From b3c1ee107d7770170f8e6b3ea48759eef0361c9f Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Mon, 8 May 2023 11:31:09 +1100
Subject: [PATCH 10/15] Fix `data with thread storage duration may not have dll
Subject: [PATCH 10/16] Fix `data with thread storage duration may not have dll
interface`

Windows needs a workaround.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From e0bff5ae140f3a1d1544449750581a5f7f16b1ee Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Fri, 9 Jun 2023 17:03:08 +1100
Subject: [PATCH 11/15] put some grpc::experimental classes needed by arrow in
Subject: [PATCH 11/16] put some grpc::experimental classes needed by arrow in
DLL

also provide implementation for destructor of CertificateProviderInterface;
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0012-link-grpc-_unsecure-to-grpc.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 4175e0583ca228d0fa1b3bbb2a75a2d399cfc3c4 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Fri, 9 Jun 2023 20:11:22 +1100
Subject: [PATCH 12/15] link grpc++_unsecure to grpc++
Subject: [PATCH 12/16] link grpc++_unsecure to grpc++

which is where CertificateProviderInterface etc. live
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From d2d0de52783482f10f8aa597449e35251873c656 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 13/15] don't use find_dependency for protobuf
Subject: [PATCH 13/16] don't use find_dependency for protobuf

---
cmake/protobuf.cmake | 2 +-
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 82e44a11be852e9cb92a68809f97be7d435734cc Mon Sep 17 00:00:00 2001
From: jrandolf <101637635+jrandolf@users.noreply.github.com>
Date: Mon, 21 Aug 2023 23:42:32 +0200
Subject: [PATCH 14/15] [OpenSSL] Support for OpenSSL 3 (#31256)
Subject: [PATCH 14/16] [OpenSSL] Support for OpenSSL 3 (#31256)

Update from gtcooke94:
This PR adds support to build gRPC and it's tests with OpenSSL3. There were some
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 9dd0c9429c6928634b5da2aab913ef0e83409e58 Mon Sep 17 00:00:00 2001
From: Gregory Cooke <gregorycooke@google.com>
Date: Wed, 23 Aug 2023 15:48:46 -0400
Subject: [PATCH 15/15] [Testing] Disable failing OpenSSL Test (#34131)
Subject: [PATCH 15/16] [Testing] Disable failing OpenSSL Test (#34131)

We enabled OpenSSL3 testing with #31256 and missed a failing test

Expand Down
21 changes: 21 additions & 0 deletions recipe/patches/0016-add-missing-linkages-for-tests.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
From f6dfc9e7010f8aefdae71b9e4d11d4ef2ca93af9 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 16/16] add missing linkages for tests

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 836fb1daa7..0588edf039 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6329,6 +6329,7 @@ target_link_libraries(authorization_matchers_test
${_gRPC_BASELIB_LIBRARIES}
${_gRPC_PROTOBUF_LIBRARIES}
${_gRPC_ZLIB_LIBRARIES}
+ ${_gRPC_RE2_LIBRARIES}
${_gRPC_ALLTARGETS_LIBRARIES}
grpc_test_util
)

0 comments on commit 55eeb91

Please sign in to comment.