diff options
Diffstat (limited to 'third_party/grpc/grpc.patch')
| -rw-r--r-- | third_party/grpc/grpc.patch | 88 |
1 files changed, 88 insertions, 0 deletions
diff --git a/third_party/grpc/grpc.patch b/third_party/grpc/grpc.patch new file mode 100644 index 0000000000..6fde44c782 --- /dev/null +++ b/third_party/grpc/grpc.patch @@ -0,0 +1,88 @@ +diff --git a/BUILD b/BUILD +index 6dcc76eb7a..903739bfad 100644 +--- a/BUILD ++++ b/BUILD +@@ -287,6 +287,7 @@ grpc_cc_library( + "grpc++_base_unsecure", + "grpc++_codegen_base", + "grpc++_codegen_base_src", ++ "grpc++_codegen_proto", + "grpc_unsecure", + ], + ) +diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl +index f793cae56d..0295adb8ab 100644 +--- a/bazel/grpc_build_system.bzl ++++ b/bazel/grpc_build_system.bzl +@@ -80,7 +80,7 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data + linkopts = ["-pthread"], + ) + +-def grpc_cc_binary(name, srcs = [], deps = [], external_deps = [], args = [], data = [], language = "C++", testonly = False, linkshared = False): ++def grpc_cc_binary(name, srcs = [], deps = [], external_deps = [], args = [], data = [], language = "C++", testonly = False, linkshared = False, linkopts = []): + copts = [] + if language.upper() == "C": + copts = ["-std=c99"] +@@ -93,7 +93,7 @@ def grpc_cc_binary(name, srcs = [], deps = [], external_deps = [], args = [], da + linkshared = linkshared, + deps = deps + ["//external:" + dep for dep in external_deps], + copts = copts, +- linkopts = ["-pthread"], ++ linkopts = ["-pthread"] + linkopts, + ) + + def grpc_generate_one_off_targets(): +diff --git a/src/core/plugin_registry/grpc_unsecure_plugin_registry.c b/src/core/plugin_registry/grpc_unsecure_plugin_registry.c +index 7eb599d81a..4cc2e30af4 100644 +--- a/src/core/plugin_registry/grpc_unsecure_plugin_registry.c ++++ b/src/core/plugin_registry/grpc_unsecure_plugin_registry.c +@@ -28,18 +28,12 @@ extern void grpc_client_channel_init(void); + extern void grpc_client_channel_shutdown(void); + extern void grpc_inproc_plugin_init(void); + extern void grpc_inproc_plugin_shutdown(void); +-extern void grpc_resolver_dns_ares_init(void); +-extern void grpc_resolver_dns_ares_shutdown(void); + extern void grpc_resolver_dns_native_init(void); + extern void grpc_resolver_dns_native_shutdown(void); + extern void grpc_resolver_sockaddr_init(void); + extern void grpc_resolver_sockaddr_shutdown(void); +-extern void grpc_resolver_fake_init(void); +-extern void grpc_resolver_fake_shutdown(void); + extern void grpc_load_reporting_plugin_init(void); + extern void grpc_load_reporting_plugin_shutdown(void); +-extern void grpc_lb_policy_grpclb_init(void); +-extern void grpc_lb_policy_grpclb_shutdown(void); + extern void grpc_lb_policy_pick_first_init(void); + extern void grpc_lb_policy_pick_first_shutdown(void); + extern void grpc_lb_policy_round_robin_init(void); +@@ -64,18 +58,12 @@ void grpc_register_built_in_plugins(void) { + grpc_client_channel_shutdown); + grpc_register_plugin(grpc_inproc_plugin_init, + grpc_inproc_plugin_shutdown); +- grpc_register_plugin(grpc_resolver_dns_ares_init, +- grpc_resolver_dns_ares_shutdown); + grpc_register_plugin(grpc_resolver_dns_native_init, + grpc_resolver_dns_native_shutdown); + grpc_register_plugin(grpc_resolver_sockaddr_init, + grpc_resolver_sockaddr_shutdown); +- grpc_register_plugin(grpc_resolver_fake_init, +- grpc_resolver_fake_shutdown); + grpc_register_plugin(grpc_load_reporting_plugin_init, + grpc_load_reporting_plugin_shutdown); +- grpc_register_plugin(grpc_lb_policy_grpclb_init, +- grpc_lb_policy_grpclb_shutdown); + grpc_register_plugin(grpc_lb_policy_pick_first_init, + grpc_lb_policy_pick_first_shutdown); + grpc_register_plugin(grpc_lb_policy_round_robin_init, +diff --git a/test/cpp/util/BUILD b/test/cpp/util/BUILD +index 33240f6f69..d2e1f67f06 100644 +--- a/test/cpp/util/BUILD ++++ b/test/cpp/util/BUILD +@@ -29,6 +29,7 @@ package( + grpc_cc_binary( + name = "testso.so", + srcs = [], ++ linkopts = ['-Wl,--no-undefined'], + linkshared = 1, + deps = ["//:grpc++_unsecure"], + ) |