Merge pull request #342 from regro-cf-autotick-bot/1.60.0_ha2e99d

grpc-cpp v1.60.0

recipe/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "1.59.3" %}
+{% set version = "1.60.0" %}
 
 # core package & vendored libs use different version scheme than CPP libs, see
 # https://github.com/grpc/grpc/blob/v1.48.1/CMakeLists.txt#L28-L32
@@ -19,7 +19,7 @@ package:
 
 source:
   url: https://github.com/grpc/grpc/archive/v{{ version.replace(".pre", "-pre") }}.tar.gz
-  sha256: ea281bb3489520ad4fb96ae84b45ed194a1f0b944d3e74f925f5e019d31ecd0f
+  sha256: 437068b8b777d3b339da94d3498f1dc20642ac9bfa76db43abdd522186b1542b
   patches:
     - patches/0001-windows-ssl-lib-names.patch         # [win]
     - patches/0002-fix-win-setup-cmds.patch            # [win]

recipe/patches/0001-windows-ssl-lib-names.patch

@@ -1,4 +1,4 @@
-From 41f59fa39cf07a6ffc103c7943f54b8912b56cf7 Mon Sep 17 00:00:00 2001
+From 4a69580365f8ce13287d7d113bc0732a8e11a658 Mon Sep 17 00:00:00 2001
 From: Jonathan Helmus <[email protected]>
 Date: Mon, 17 Feb 2020 15:45:06 -0600
 Subject: [PATCH 1/8] windows ssl lib names
@@ -11,10 +11,10 @@ Co-Authored-By: Marius van Niekerk <[email protected]>
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 94aa7793a7..5892a3288f 100644
+index 97c1dce..82de367 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -363,10 +363,10 @@ if "win32" in sys.platform:
+@@ -366,10 +366,10 @@ if "win32" in sys.platform:
          "ws2_32",
      )
  if BUILD_WITH_SYSTEM_OPENSSL:

recipe/patches/0002-fix-win-setup-cmds.patch

@@ -1,4 +1,4 @@
-From 16e076fe81475855a4d60c71b8063a3cab5718fd Mon Sep 17 00:00:00 2001
+From 847ac86cbc8ccfb3cd86abc42385c1ca4dfd8583 Mon Sep 17 00:00:00 2001
 From: Mike Sarahan <[email protected]>
 Date: Tue, 18 Feb 2020 13:53:05 -0600
 Subject: [PATCH 2/8] fix win setup cmds
@@ -13,10 +13,10 @@ Co-Authored-By: H. Vetinari <[email protected]>
  2 files changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 5892a3288f..6a9c0f25a5 100644
+index 82de367..47e1f25 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -216,6 +216,9 @@ ENABLE_DOCUMENTATION_BUILD = _env_bool_value(
+@@ -214,6 +214,9 @@ ENABLE_DOCUMENTATION_BUILD = _env_bool_value(
 
 
  def check_linker_need_libatomic():
@@ -26,7 +26,7 @@ index 5892a3288f..6a9c0f25a5 100644
      """Test if linker on system needs libatomic."""
      code_test = (
          b"#include <atomic>\n"
-@@ -270,10 +273,6 @@ if EXTRA_ENV_COMPILE_ARGS is None:
+@@ -268,10 +271,6 @@ if EXTRA_ENV_COMPILE_ARGS is None:
                  EXTRA_ENV_COMPILE_ARGS += (
                      " -D_ftime=_ftime64 -D_timeb=__timeb64"
                  )
@@ -38,7 +38,7 @@ index 5892a3288f..6a9c0f25a5 100644
          EXTRA_ENV_COMPILE_ARGS += (
              " -fvisibility=hidden -fno-wrapv -fno-exceptions"
 diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py
-index 338dbd7d26..0dccff169c 100644
+index 98324c9..484aef0 100644
 --- a/src/python/grpcio/commands.py
 +++ b/src/python/grpcio/commands.py
 @@ -252,6 +252,8 @@ class BuildExt(build_ext.build_ext):

recipe/patches/0003-Link-against-grpc.patch

@@ -1,4 +1,4 @@
-From 2982a5441890366e0272fe066c80d4a4053c0cdf Mon Sep 17 00:00:00 2001
+From 53248d3b5e17d4919087d316b616c06f75258b3d Mon Sep 17 00:00:00 2001
 From: Marius van Niekerk <[email protected]>
 Date: Mon, 13 Jun 2022 17:13:07 -0400
 Subject: [PATCH 3/8] Link against grpc
@@ -8,10 +8,10 @@ Subject: [PATCH 3/8] Link against grpc
  1 file changed, 10 insertions(+)
 
 diff --git a/setup.py b/setup.py
-index 6a9c0f25a5..e65479ab4b 100644
+index 47e1f25..de07e6d 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -181,6 +181,8 @@ BUILD_WITH_STATIC_LIBSTDCXX = _env_bool_value(
+@@ -179,6 +179,8 @@ BUILD_WITH_STATIC_LIBSTDCXX = _env_bool_value(
      "GRPC_PYTHON_BUILD_WITH_STATIC_LIBSTDCXX", "False"
  )
 
@@ -20,7 +20,7 @@ index 6a9c0f25a5..e65479ab4b 100644
  # For local development use only: This skips building gRPC Core and its
  # dependencies, including protobuf and boringssl. This allows "incremental"
  # compilation by first building gRPC Core using make, then building only the
-@@ -376,6 +378,11 @@ if BUILD_WITH_SYSTEM_ABSL:
+@@ -379,6 +381,11 @@ if BUILD_WITH_SYSTEM_ABSL:
      EXTENSION_LIBRARIES += tuple(
          lib.stem[3:] for lib in pathlib.Path("/usr").glob("lib*/libabsl_*.so")
      )
@@ -32,7 +32,7 @@ index 6a9c0f25a5..e65479ab4b 100644
 
  DEFINE_MACROS = (("_WIN32_WINNT", 0x600),)
  asm_files = []
-@@ -501,6 +508,9 @@ def cython_extensions_and_necessity():
+@@ -504,6 +511,9 @@ def cython_extensions_and_necessity():
              prefix + "libgrpc.a",
          ]
          core_c_files = []

recipe/patches/0004-force-protoc-executable.patch

@@ -1,4 +1,4 @@
-From 3c986e97c53dec62a159d0ee58aa65e3cac62098 Mon Sep 17 00:00:00 2001
+From 0678a537aa148e7a57862f2c9a34ae517fa82942 Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <[email protected]>
 Date: Fri, 11 Sep 2020 14:20:04 +0200
 Subject: [PATCH 4/8] force protoc executable
@@ -8,7 +8,7 @@ Subject: [PATCH 4/8] force protoc executable
  1 file changed, 2 insertions(+), 15 deletions(-)
 
 diff --git a/cmake/protobuf.cmake b/cmake/protobuf.cmake
-index fab2eb00e9..fd3f326247 100644
+index fab2eb0..fd3f326 100644
 --- a/cmake/protobuf.cmake
 +++ b/cmake/protobuf.cmake
 @@ -71,21 +71,8 @@ elseif(gRPC_PROTOBUF_PROVIDER STREQUAL "package")

recipe/patches/0005-switch-to-C-17-for-grpcio.patch

@@ -1,4 +1,4 @@
-From 9d0de2aff22c0c4642bcb3214048c1ae704f1936 Mon Sep 17 00:00:00 2001
+From cdaa8fd5da08bd41b04115aed481b13183d51df8 Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <[email protected]>
 Date: Sat, 3 Sep 2022 19:23:15 +0200
 Subject: [PATCH 5/8] switch to C++17 for grpcio
@@ -8,10 +8,10 @@ Subject: [PATCH 5/8] switch to C++17 for grpcio
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index e65479ab4b..d0f80e4924 100644
+index de07e6d..897dae7 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -228,7 +228,7 @@ def check_linker_need_libatomic():
+@@ -226,7 +226,7 @@ def check_linker_need_libatomic():
      )
      cxx = shlex.split(os.environ.get("CXX", "c++"))
      cpp_test = subprocess.Popen(
@@ -20,7 +20,7 @@ index e65479ab4b..d0f80e4924 100644
          stdin=PIPE,
          stdout=PIPE,
          stderr=PIPE,
-@@ -239,7 +239,7 @@ def check_linker_need_libatomic():
+@@ -237,7 +237,7 @@ def check_linker_need_libatomic():
      # Double-check to see if -latomic actually can solve the problem.
      # https://github.com/grpc/grpc/issues/22491
      cpp_test = subprocess.Popen(
@@ -29,7 +29,7 @@ index e65479ab4b..d0f80e4924 100644
          stdin=PIPE,
          stdout=PIPE,
          stderr=PIPE,
-@@ -258,8 +258,9 @@ def check_linker_need_libatomic():
+@@ -256,8 +256,9 @@ def check_linker_need_libatomic():
  EXTRA_ENV_COMPILE_ARGS = os.environ.get("GRPC_PYTHON_CFLAGS", None)
  EXTRA_ENV_LINK_ARGS = os.environ.get("GRPC_PYTHON_LDFLAGS", None)
  if EXTRA_ENV_COMPILE_ARGS is None:

recipe/patches/0006-fix-abseil-setup.patch

@@ -1,4 +1,4 @@
-From 96579d532a286bc4eb6c8db4930c54acdf6d22b7 Mon Sep 17 00:00:00 2001
+From f2c13fd336ef497b40792540cf94fd6043c36b35 Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <[email protected]>
 Date: Sun, 4 Sep 2022 14:34:52 +0200
 Subject: [PATCH 6/8] fix abseil setup
@@ -8,10 +8,10 @@ Subject: [PATCH 6/8] fix abseil setup
  1 file changed, 11 insertions(+), 4 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index d0f80e4924..d297669352 100644
+index 897dae7..cc904da 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -376,14 +376,21 @@ if BUILD_WITH_SYSTEM_CARES:
+@@ -379,14 +379,21 @@ if BUILD_WITH_SYSTEM_CARES:
  if BUILD_WITH_SYSTEM_RE2:
      EXTENSION_LIBRARIES += ("re2",)
  if BUILD_WITH_SYSTEM_ABSL:

recipe/patches/0007-mark-linkage-of-c-ares-re2-zlib-as-private.patch

@@ -1,4 +1,4 @@
-From 58485e3ebfb41edaa6ee8db1d90c99462ac893f9 Mon Sep 17 00:00:00 2001
+From 300b6ddc466e64d437b6f3ef074eaa7b1fe3d391 Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <[email protected]>
 Date: Tue, 23 Aug 2022 11:45:20 +0200
 Subject: [PATCH 7/8] mark linkage of c-ares/re2/zlib as private
@@ -7,21 +7,23 @@ See also: https://github.com/grpc/grpc/issues/30838
 
 Co-Authored-By: Mark Harfouche <[email protected]>
 ---
- CMakeLists.txt | 102 +++++++++++++++++++++++++++----------------------
- 1 file changed, 56 insertions(+), 46 deletions(-)
+ CMakeLists.txt | 108 +++++++++++++++++++++++++++----------------------
+ 1 file changed, 59 insertions(+), 49 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 14501a181d..f9ae4d9861 100644
+index 06e6453..dd4f72b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -2540,32 +2540,37 @@ target_include_directories(grpc
+@@ -2569,34 +2569,39 @@ target_include_directories(grpc
      ${_gRPC_ZLIB_INCLUDE_DIR}
  )
  target_link_libraries(grpc
 -  ${_gRPC_ALLTARGETS_LIBRARIES}
--  ${_gRPC_RE2_LIBRARIES}
+-  upb_collections_lib
 -  upb_json_lib
 -  upb_textformat_lib
+-  upb
+-  ${_gRPC_RE2_LIBRARIES}
 -  ${_gRPC_ZLIB_LIBRARIES}
 -  absl::algorithm_container
 -  absl::cleanup
@@ -42,47 +44,50 @@ index 14501a181d..f9ae4d9861 100644
 -  ${_gRPC_SSL_LIBRARIES}
 -  ${_gRPC_ADDRESS_SORTING_LIBRARIES}
 +  # core libs
-+  PUBLIC  ${_gRPC_ALLTARGETS_LIBRARIES}
++  PUBLIC ${_gRPC_ALLTARGETS_LIBRARIES}
 +  # vendored libs
-+  PUBLIC  ${_gRPC_ADDRESS_SORTING_LIBRARIES}
-+  PUBLIC  upb_json_lib
-+  PUBLIC  upb_textformat_lib
++  PUBLIC ${_gRPC_ADDRESS_SORTING_LIBRARIES}
++  PUBLIC upb_collections_lib
++  PUBLIC upb_json_lib
++  PUBLIC upb_textformat_lib
++  PUBLIC upb
 +  # external dependencies used within grpc
-+  PRIVATE ${_gRPC_CARES_LIBRARIES}
 +  PRIVATE ${_gRPC_RE2_LIBRARIES}
 +  PRIVATE ${_gRPC_ZLIB_LIBRARIES}
++  PRIVATE ${_gRPC_CARES_LIBRARIES}
 +  # external dependencies that need to available at runtime
-+  PUBLIC  ${_gRPC_SSL_LIBRARIES}
-+  PUBLIC  absl::algorithm_container
-+  PUBLIC  absl::cleanup
-+  PUBLIC  absl::flat_hash_map
-+  PUBLIC  absl::flat_hash_set
-+  PUBLIC  absl::inlined_vector
-+  PUBLIC  absl::bind_front
-+  PUBLIC  absl::function_ref
-+  PUBLIC  absl::hash
-+  PUBLIC  absl::type_traits
-+  PUBLIC  absl::random_bit_gen_ref
-+  PUBLIC  absl::random_distributions
-+  PUBLIC  absl::statusor
-+  PUBLIC  absl::span
-+  PUBLIC  absl::utility
++  PUBLIC absl::algorithm_container
++  PUBLIC absl::cleanup
++  PUBLIC absl::flat_hash_map
++  PUBLIC absl::flat_hash_set
++  PUBLIC absl::inlined_vector
++  PUBLIC absl::bind_front
++  PUBLIC absl::function_ref
++  PUBLIC absl::hash
++  PUBLIC absl::type_traits
++  PUBLIC absl::random_bit_gen_ref
++  PUBLIC absl::random_distributions
++  PUBLIC absl::statusor
++  PUBLIC absl::span
++  PUBLIC absl::utility
++  PUBLIC ${_gRPC_SSL_LIBRARIES}
 +  # targets which belong to grpc anyway
-+  PUBLIC  gpr
++  PUBLIC gpr
  )
  if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)
 -  target_link_libraries(grpc "-framework CoreFoundation")
 +  target_link_libraries(grpc PUBLIC "-framework CoreFoundation")
  endif()
 
  foreach(_hdr
-@@ -3202,30 +3207,35 @@ target_include_directories(grpc_unsecure
+@@ -3246,31 +3251,36 @@ target_include_directories(grpc_unsecure
      ${_gRPC_ZLIB_INCLUDE_DIR}
  )
  target_link_libraries(grpc_unsecure
 -  ${_gRPC_ALLTARGETS_LIBRARIES}
 -  upb_collections_lib
 -  upb
+-  utf8_range_lib
 -  ${_gRPC_ZLIB_LIBRARIES}
 -  absl::algorithm_container
 -  absl::cleanup
@@ -102,31 +107,32 @@ index 14501a181d..f9ae4d9861 100644
 -  gpr
 -  ${_gRPC_ADDRESS_SORTING_LIBRARIES}
 +  # core libs
-+  PUBLIC  ${_gRPC_ALLTARGETS_LIBRARIES}
++  PUBLIC ${_gRPC_ALLTARGETS_LIBRARIES}
 +  # vendored libs
-+  PUBLIC  ${_gRPC_ADDRESS_SORTING_LIBRARIES}
-+  PUBLIC  upb_collections_lib
-+  PUBLIC  upb
++  PUBLIC ${_gRPC_ADDRESS_SORTING_LIBRARIES}
++  PUBLIC upb_collections_lib
++  PUBLIC upb
 +  # external dependencies used within grpc
-+  PRIVATE ${_gRPC_CARES_LIBRARIES}
 +  PRIVATE ${_gRPC_ZLIB_LIBRARIES}
++  PRIVATE ${_gRPC_CARES_LIBRARIES}
 +  # external dependencies that need to available at runtime
-+  PUBLIC  absl::algorithm_container
-+  PUBLIC  absl::cleanup
-+  PUBLIC  absl::flat_hash_map
-+  PUBLIC  absl::flat_hash_set
-+  PUBLIC  absl::inlined_vector
-+  PUBLIC  absl::bind_front
-+  PUBLIC  absl::function_ref
-+  PUBLIC  absl::hash
-+  PUBLIC  absl::type_traits
-+  PUBLIC  absl::random_bit_gen_ref
-+  PUBLIC  absl::random_distributions
-+  PUBLIC  absl::statusor
-+  PUBLIC  absl::span
-+  PUBLIC  absl::utility
++  PUBLIC utf8_range_lib
++  PUBLIC absl::algorithm_container
++  PUBLIC absl::cleanup
++  PUBLIC absl::flat_hash_map
++  PUBLIC absl::flat_hash_set
++  PUBLIC absl::inlined_vector
++  PUBLIC absl::bind_front
++  PUBLIC absl::function_ref
++  PUBLIC absl::hash
++  PUBLIC absl::type_traits
++  PUBLIC absl::random_bit_gen_ref
++  PUBLIC absl::random_distributions
++  PUBLIC absl::statusor
++  PUBLIC absl::span
++  PUBLIC absl::utility
 +  # targets which belong to grpc anyway
-+  PUBLIC  gpr
++  PUBLIC gpr
  )
  if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)
 -  target_link_libraries(grpc_unsecure "-framework CoreFoundation")