Skip to content

Commit

Permalink
iterate on symbol visibility
Browse files Browse the repository at this point in the history
  • Loading branch information
h-vetinari committed Feb 3, 2025
1 parent a948ded commit 840781e
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
From 6e75f1297b46703346d97cca9a0bbb7b16ce100a Mon Sep 17 00:00:00 2001
From 8785c1fa55e4312d4bb4e1abec88594d38f3791f Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Mon, 3 Feb 2025 11:51:28 +1100
Subject: [PATCH 15/16] break out part of grpc into grpc_upb due to too many
symbols

---
CMakeLists.txt | 235 +++++++++++++++++++++----------
CMakeLists.txt | 238 +++++++++++++++++++++----------
third_party/upb/upb/port/def.inc | 16 +--
2 files changed, 169 insertions(+), 82 deletions(-)
2 files changed, 171 insertions(+), 83 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52b3ee9c62..0e1e3c8613 100644
index 52b3ee9c62..3627bd99b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2261,80 +2261,8 @@ if(gRPC_INSTALL)
Expand Down Expand Up @@ -261,11 +261,21 @@ index 52b3ee9c62..0e1e3c8613 100644
src/core/filter/blackboard.cc
src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc
src/core/handshaker/handshaker.cc
@@ -3147,6 +3233,7 @@ target_link_libraries(grpc
@@ -3094,7 +3180,8 @@ if(WIN32 AND MSVC)
)
if(BUILD_SHARED_LIBS)
set_target_properties(grpc PROPERTIES DEFINE_SYMBOL "GRPC_DLL_EXPORTS")
- target_compile_definitions(grpc INTERFACE "GRPC_DLL_IMPORTS")
+ set_target_properties(grpc PROPERTIES DEFINE_SYMBOL "GRPC_UPB_DLL_IMPORTS")
+ target_compile_definitions(grpc INTERFACE "GRPC_DLL_IMPORTS" "GRPC_UPB_DLL_IMPORTS")
endif()
if(gRPC_INSTALL)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc.pdb
@@ -3147,6 +3234,7 @@ target_link_libraries(grpc
PUBLIC absl::utility
# targets which belong to grpc anyway
PUBLIC gpr
+ PRIVATE grpc_upb
+ PUBLIC grpc_upb
)
if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)
target_link_libraries(grpc PUBLIC "-framework CoreFoundation")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 465dbd532aafd0eb36fa29ea2979892dd6ee2848 Mon Sep 17 00:00:00 2001
From 6be08cf5effcac7cb14378ac15fe25e19d299907 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Mon, 3 Feb 2025 14:00:47 +1100
Subject: [PATCH 16/16] add symbol export annotations to UPB definitions
Expand Down

0 comments on commit 840781e

Please sign in to comment.