Merge pull request #304 from regro-cf-autotick-bot/1.56.0_h95568b

grpc-cpp v1.56.0
conda-forge · Jun 30, 2023 · 57275e4 · 57275e4
2 parents 646e893 + cc0f78f
commit 57275e4
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 10 deletions.
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -19,7 +19,7 @@ docker_image:
 libabseil:
 - '20230125'
 libprotobuf:
-- '4.23'
+- 4.23.2
 openssl:
 - '3'
 pin_run_as_build:

diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -23,7 +23,7 @@ docker_image:
 libabseil:
 - '20230125'
 libprotobuf:
-- '4.23'
+- 4.23.2
 openssl:
 - '3'
 pin_run_as_build:

diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml
@@ -19,7 +19,7 @@ docker_image:
 libabseil:
 - '20230125'
 libprotobuf:
-- '4.23'
+- 4.23.2
 openssl:
 - '3'
 pin_run_as_build:

diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
+- '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
 c_ares:
 - '1'
 c_compiler:
@@ -17,7 +19,7 @@ cxx_compiler_version:
 libabseil:
 - '20230125'
 libprotobuf:
-- '4.23'
+- 4.23.2
 macos_machine:
 - x86_64-apple-darwin13.4.0
 openssl:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -17,7 +17,7 @@ cxx_compiler_version:
 libabseil:
 - '20230125'
 libprotobuf:
-- '4.23'
+- 4.23.2
 macos_machine:
 - arm64-apple-darwin20.0.0
 openssl:

diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -11,7 +11,7 @@ cxx_compiler:
 libabseil:
 - '20230125'
 libprotobuf:
-- '4.23'
+- 4.23.2
 openssl:
 - '3'
 pin_run_as_build:

diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -1,2 +1,9 @@
+# grpc requires C11 aligned_alloc as of 1.56; we cannot inject our own
+# stdlib for C like we do for libcxx, so we need to bump also the target
+MACOSX_DEPLOYMENT_TARGET:  # [osx and x86_64]
+  - "10.13"                # [osx and x86_64]
+MACOSX_SDK_VERSION:        # [osx and x86_64]
+  - "10.13"                # [osx and x86_64]
+
 libprotobuf:
-  - "4.23"
+  - "4.23.2"
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "1.55.1" %}
+{% set version = "1.56.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: 9c3c0a0ad986ee4fc0a9b58fd71255010068df7d1437c425b525d68c30c85ac7
+  sha256: e034992a0b464042021f6d440f2090acc2422c103a322b0844e3921ccea981dc
   patches:
     - patches/0001-windows-ssl-lib-names.patch         # [win]
     - patches/0002-fix-win-setup-cmds.patch            # [win]
@@ -73,6 +73,7 @@ outputs:
         - zlib
       run:
         - ucrt  # [win]
+        - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }}  # [osx and x86_64]
       run_constrained:
         # make sure we don't co-install with old version of previous package name
         - grpc-cpp ={{ version }}