From e323a7df5393a30824c3d2c1451df36eaac9c787 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abril=20Rinc=C3=B3n=20Blanco?= Date: Thu, 25 Jul 2024 10:54:31 +0200 Subject: [PATCH] (#24700) grpc: Revert `grpc` component name to `_grpc` * Revert grpc component name, it breaks recipes which unadvertedly depended on it * Rename in requires clauses too --- recipes/grpc/all/target_info/grpc_1.50.0.yml | 6 +++--- recipes/grpc/all/target_info/grpc_1.50.1.yml | 4 ++-- recipes/grpc/all/target_info/grpc_1.54.3.yml | 5 ++--- recipes/grpc/all/target_info/grpc_1.65.0.yml | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/recipes/grpc/all/target_info/grpc_1.50.0.yml b/recipes/grpc/all/target_info/grpc_1.50.0.yml index d1a6b8f79dfef..693b7c8e2a330 100644 --- a/recipes/grpc/all/target_info/grpc_1.50.0.yml +++ b/recipes/grpc/all/target_info/grpc_1.50.0.yml @@ -17,7 +17,7 @@ grpc_targets: - abseil::absl_time - abseil::absl_optional - abseil::absl_variant - - name: "grpc" + - name: "_grpc" lib: "grpc" requires: - zlib::zlib @@ -70,7 +70,7 @@ grpc_targets: requires: - protobuf::libprotobuf - abseil::absl_cleanup - - grpc + - _grpc - name: "grpc++_alts" lib: "grpc++_alts" requires: @@ -117,4 +117,4 @@ grpc_plugins: - target: "gRPC::grpc_python_plugin" executable: "grpc_python_plugin" - target: "gRPC::grpc_ruby_plugin" - executable: "grpc_ruby_plugin" \ No newline at end of file + executable: "grpc_ruby_plugin" diff --git a/recipes/grpc/all/target_info/grpc_1.50.1.yml b/recipes/grpc/all/target_info/grpc_1.50.1.yml index 7d30621d33694..3bf059795e135 100644 --- a/recipes/grpc/all/target_info/grpc_1.50.1.yml +++ b/recipes/grpc/all/target_info/grpc_1.50.1.yml @@ -17,7 +17,7 @@ grpc_targets: - abseil::absl_time - abseil::absl_optional - abseil::absl_variant - - name: "grpc" + - name: "_grpc" lib: "grpc" requires: - zlib::zlib @@ -70,7 +70,7 @@ grpc_targets: requires: - protobuf::libprotobuf - abseil::absl_cleanup - - grpc + - _grpc - name: "grpc++_alts" lib: "grpc++_alts" requires: diff --git a/recipes/grpc/all/target_info/grpc_1.54.3.yml b/recipes/grpc/all/target_info/grpc_1.54.3.yml index 36c0b8d389474..a97cd9a17b217 100644 --- a/recipes/grpc/all/target_info/grpc_1.54.3.yml +++ b/recipes/grpc/all/target_info/grpc_1.54.3.yml @@ -23,7 +23,7 @@ grpc_targets: - abseil::absl_time - abseil::absl_optional - abseil::absl_variant - - name: "grpc" + - name: "_grpc" lib: "grpc" requires: - zlib::zlib @@ -76,7 +76,7 @@ grpc_targets: requires: - protobuf::libprotobuf - zlib::zlib - - grpc + - _grpc - name: "grpc++_alts" lib: "grpc++_alts" requires: @@ -150,4 +150,3 @@ grpc_plugins: executable: "grpc_python_plugin" - target: "gRPC::grpc_ruby_plugin" executable: "grpc_ruby_plugin" - \ No newline at end of file diff --git a/recipes/grpc/all/target_info/grpc_1.65.0.yml b/recipes/grpc/all/target_info/grpc_1.65.0.yml index 5a77cc2e613f6..43591e8d36116 100644 --- a/recipes/grpc/all/target_info/grpc_1.65.0.yml +++ b/recipes/grpc/all/target_info/grpc_1.65.0.yml @@ -24,7 +24,7 @@ grpc_targets: - abseil::absl_time - abseil::absl_optional - abseil::absl_variant - - name: "grpc" + - name: "_grpc" lib: "grpc" requires: - upb_json_lib @@ -105,7 +105,7 @@ grpc_targets: requires: - abseil::absl_absl_check - abseil::absl_absl_log - - grpc + - _grpc - protobuf::libprotobuf - name: "grpc++_alts" lib: "grpc++_alts"