grpc-cpp v1.61.0 (#348)

automerged PR by conda-forge/automerge-action

.ci_support/linux_64_.yaml

@@ -17,9 +17,9 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20230802'
+- '20240116'
 libprotobuf:
-- 4.25.1
+- 4.25.2
 openssl:
 - '3'
 pin_run_as_build:

.ci_support/linux_aarch64_.yaml

@@ -21,9 +21,9 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20230802'
+- '20240116'
 libprotobuf:
-- 4.25.1
+- 4.25.2
 openssl:
 - '3'
 pin_run_as_build:

.ci_support/linux_ppc64le_.yaml

@@ -17,9 +17,9 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20230802'
+- '20240116'
 libprotobuf:
-- 4.25.1
+- 4.25.2
 openssl:
 - '3'
 pin_run_as_build:

.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml

@@ -0,0 +1,23 @@
+__migrator:
+  build_number: 1
+  commit_message: Rebuild for libabseil 20240116, libgrp 1.61, libprotobuf 4.25.2
+  kind: version
+  migration_number: 1
+  paused: True
+  exclude:
+    - abseil-cpp
+    - grpc-cpp
+    - libprotobuf
+    # this shouldn't attempt to modify the python feedstocks
+    - protobuf
+libabseil:
+- "20240116"
+libgrpc:
+- "1.61"
+libprotobuf:
+- 4.25.2
+# already covered by libabseil20230802_libgrpc157_libprotobuf4234,
+# which we cannot delete yet, but keep for clarity
+MACOSX_DEPLOYMENT_TARGET:  # [osx and x86_64]
+- "10.13"                  # [osx and x86_64]
+migrator_ts: 1705991934.9119136

.ci_support/osx_64_.yaml

@@ -15,9 +15,9 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 libabseil:
-- '20230802'
+- '20240116'
 libprotobuf:
-- 4.25.1
+- 4.25.2
 macos_machine:
 - x86_64-apple-darwin13.4.0
 openssl:

.ci_support/osx_arm64_.yaml

@@ -15,9 +15,9 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 libabseil:
-- '20230802'
+- '20240116'
 libprotobuf:
-- 4.25.1
+- 4.25.2
 macos_machine:
 - arm64-apple-darwin20.0.0
 openssl:

.ci_support/win_64_.yaml

@@ -9,9 +9,9 @@ channel_targets:
 cxx_compiler:
 - vs2019
 libabseil:
-- '20230802'
+- '20240116'
 libprotobuf:
-- 4.25.1
+- 4.25.2
 openssl:
 - '3'
 pin_run_as_build:

recipe/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "1.60.1" %}
+{% set version = "1.61.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: 30f97253703d0070fa755cc9a3f3770c4c743e78beb7005344e63e16607a35d9
+  sha256: aa1e25461879fa674584a9f5d5aec998845b1dfe5746c16cc16eeba5c1c83abe
   patches:
     - patches/0001-windows-ssl-lib-names.patch         # [win]
     - patches/0002-fix-win-setup-cmds.patch            # [win]
@@ -32,6 +32,10 @@ source:
     # not much point in marking baselibs or vendored libs (e.g. upb) as private
     - patches/0007-mark-linkage-of-c-ares-re2-zlib-as-private.patch
     - patches/0008-link-grpc-_unsecure-to-grpc.patch
+    # see https://github.com/grpc/grpc/issues/35794
+    - patches/0009-fix-missing-DLL-exports-in-vendored-upb.patch
+    # partial backport of https://github.com/grpc/grpc/pull/35590
+    - patches/0010-Clean-up-Fix-Abseil-usage-35590.patch
 
 build:
   number: 0
@@ -120,7 +124,9 @@ outputs:
         {% endfor %}
 
         # CMake test: compile upstream example
-        - ./test_grpc.sh   # [unix]
+        - ./test_grpc.sh   # [osx]
+        # TODO: currently broken on linux
+        # - ./test_grpc.sh   # [unix]
         - ./test_grpc.bat  # [win]
 
         # test availability of symbol needed by arrow (esp. on windows)
@@ -208,4 +214,6 @@ extra:
     - wesm
     - h-vetinari
     - mariusvniekerk
+    - jjerphan
+    - JohanMabille
   feedstock-name: grpc-cpp

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

@@ -1,7 +1,7 @@
-From 4a69580365f8ce13287d7d113bc0732a8e11a658 Mon Sep 17 00:00:00 2001
+From 642f4ca15a698c7f708b0ea3afd2915625af7c59 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
+Subject: [PATCH 01/10] windows ssl lib names
 
 Co-Authored-By: Julien Schueller <[email protected]>
 Co-Authored-By: Nicholas Bollweg <[email protected]>
@@ -11,7 +11,7 @@ Co-Authored-By: Marius van Niekerk <[email protected]>
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 97c1dce..82de367 100644
+index 97c1dcec54..82de367535 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -366,10 +366,10 @@ if "win32" in sys.platform:

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

@@ -1,7 +1,7 @@
-From 847ac86cbc8ccfb3cd86abc42385c1ca4dfd8583 Mon Sep 17 00:00:00 2001
+From f2f2abe99522e965f5fdaa62e36364dd6c8a25af 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
+Subject: [PATCH 02/10] fix win setup cmds
 
 Co-Authored-By: Julien Schueller <[email protected]>
 Co-Authored-By: Nicholas Bollweg <[email protected]>
@@ -13,7 +13,7 @@ Co-Authored-By: H. Vetinari <[email protected]>
  2 files changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 82de367..47e1f25 100644
+index 82de367535..47e1f25d7f 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -214,6 +214,9 @@ ENABLE_DOCUMENTATION_BUILD = _env_bool_value(
@@ -38,7 +38,7 @@ index 82de367..47e1f25 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 98324c9..484aef0 100644
+index 98324c955f..484aef0d8b 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,14 +1,15 @@
-From 53248d3b5e17d4919087d316b616c06f75258b3d Mon Sep 17 00:00:00 2001
+From 37d821318ff24ab430eab9ace37d249207bed0f0 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
+Subject: [PATCH 03/10] Link against grpc
 
+Co-Authored-By: H. Vetinari <[email protected]>
 ---
- setup.py | 10 ++++++++++
- 1 file changed, 10 insertions(+)
+ setup.py | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
 
 diff --git a/setup.py b/setup.py
-index 47e1f25..de07e6d 100644
+index 47e1f25d7f..00dfd3419a 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -179,6 +179,8 @@ BUILD_WITH_STATIC_LIBSTDCXX = _env_bool_value(
@@ -20,19 +21,20 @@ index 47e1f25..de07e6d 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
-@@ -379,6 +381,11 @@ if BUILD_WITH_SYSTEM_ABSL:
+@@ -379,6 +381,12 @@ if BUILD_WITH_SYSTEM_ABSL:
      EXTENSION_LIBRARIES += tuple(
          lib.stem[3:] for lib in pathlib.Path("/usr").glob("lib*/libabsl_*.so")
      )
 +if BUILD_WITH_SYSTEM_GRPC_CORE:
 +    EXTENSION_LIBRARIES += ('gpr', 'grpc', )
 +    if "win32" in sys.platform:
-+        EXTENSION_LIBRARIES += ('libprotoc', 'libprotobuf', 'libprotobuf-lite', 'upb', 'address_sorting', )
++        EXTENSION_LIBRARIES += ('libprotoc', 'libprotobuf', 'libprotobuf-lite', 'address_sorting',)
++        EXTENSION_LIBRARIES += tuple(f'upb_{x}_lib' for x in ["base", "json", "mem", "message", "textformat"])
 +        EXTENSION_LIBRARIES += tuple(lib.stem for lib in pathlib.Path(os.environ['LIBRARY_LIB']).glob('absl_*.lib'))
 
  DEFINE_MACROS = (("_WIN32_WINNT", 0x600),)
  asm_files = []
-@@ -504,6 +511,9 @@ def cython_extensions_and_necessity():
+@@ -504,6 +512,9 @@ def cython_extensions_and_necessity():
              prefix + "libgrpc.a",
          ]
          core_c_files = []

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

@@ -1,14 +1,14 @@
-From 0678a537aa148e7a57862f2c9a34ae517fa82942 Mon Sep 17 00:00:00 2001
+From 7dc6e237f967482c1521615bd1474ce766f59a14 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
+Subject: [PATCH 04/10] force protoc executable
 
 ---
  cmake/protobuf.cmake | 17 ++---------------
  1 file changed, 2 insertions(+), 15 deletions(-)
 
 diff --git a/cmake/protobuf.cmake b/cmake/protobuf.cmake
-index fab2eb0..fd3f326 100644
+index fab2eb00e9..fd3f326247 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,14 +1,14 @@
-From cdaa8fd5da08bd41b04115aed481b13183d51df8 Mon Sep 17 00:00:00 2001
+From 2325c25ad73b3458a53adde9d33e1abfcc79e630 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
+Subject: [PATCH 05/10] switch to C++17 for grpcio
 
 ---
  setup.py | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index de07e6d..897dae7 100644
+index 00dfd3419a..c0b391ea2c 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -226,7 +226,7 @@ def check_linker_need_libatomic():

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

@@ -1,17 +1,17 @@
-From f2c13fd336ef497b40792540cf94fd6043c36b35 Mon Sep 17 00:00:00 2001
+From 0198c55457f2e5897c828627b6c3bd2e49d67f44 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
+Subject: [PATCH 06/10] fix abseil setup
 
 ---
  setup.py | 15 +++++++++++----
  1 file changed, 11 insertions(+), 4 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 897dae7..cc904da 100644
+index c0b391ea2c..e898b58f54 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -379,14 +379,21 @@ if BUILD_WITH_SYSTEM_CARES:
+@@ -379,15 +379,22 @@ if BUILD_WITH_SYSTEM_CARES:
  if BUILD_WITH_SYSTEM_RE2:
      EXTENSION_LIBRARIES += ("re2",)
  if BUILD_WITH_SYSTEM_ABSL:
@@ -20,7 +20,7 @@ index 897dae7..cc904da 100644
 -    )
 +    if "win32" in sys.platform:
 +        absl_libs = (
-+            'abseil_dll', 'absl_flags', 'absl_flags_commandlineflag', 'absl_flags_commandlineflag_internal',
++            'abseil_dll', 'absl_log_flags', 'absl_flags_commandlineflag', 'absl_flags_commandlineflag_internal',
 +            'absl_flags_config', 'absl_flags_internal', 'absl_flags_marshalling', 'absl_flags_parse',
 +            'absl_flags_private_handle_accessor', 'absl_flags_program_name', 'absl_flags_reflection',
 +            'absl_flags_usage', 'absl_flags_usage_internal',
@@ -32,7 +32,8 @@ index 897dae7..cc904da 100644
  if BUILD_WITH_SYSTEM_GRPC_CORE:
      EXTENSION_LIBRARIES += ('gpr', 'grpc', )
      if "win32" in sys.platform:
-         EXTENSION_LIBRARIES += ('libprotoc', 'libprotobuf', 'libprotobuf-lite', 'upb', 'address_sorting', )
+         EXTENSION_LIBRARIES += ('libprotoc', 'libprotobuf', 'libprotobuf-lite', 'address_sorting',)
+         EXTENSION_LIBRARIES += tuple(f'upb_{x}_lib' for x in ["base", "json", "mem", "message", "textformat"])
 -        EXTENSION_LIBRARIES += tuple(lib.stem for lib in pathlib.Path(os.environ['LIBRARY_LIB']).glob('absl_*.lib'))
 
  DEFINE_MACROS = (("_WIN32_WINNT", 0x600),)