Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ c_stdlib_version:
- '2.17'
channel_sources:
- conda-forge
- conda-forge
- conda-forge
- conda-forge
- conda-forge,conda-forge/label/python_rc
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -29,7 +25,7 @@ libgrpc:
libprotobuf:
- 6.31.1
openssl:
- '3'
- '3.5'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -47,7 +43,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- channel_sources
zlib:
- '1'
8 changes: 1 addition & 7 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ c_stdlib_version:
- '2.17'
channel_sources:
- conda-forge
- conda-forge
- conda-forge
- conda-forge
- conda-forge,conda-forge/label/python_rc
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -29,7 +25,7 @@ libgrpc:
libprotobuf:
- 6.31.1
openssl:
- '3'
- '3.5'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -47,7 +43,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- channel_sources
zlib:
- '1'
8 changes: 1 addition & 7 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ c_stdlib_version:
- '2.17'
channel_sources:
- conda-forge
- conda-forge
- conda-forge
- conda-forge
- conda-forge,conda-forge/label/python_rc
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -29,7 +25,7 @@ libgrpc:
libprotobuf:
- 6.31.1
openssl:
- '3'
- '3.5'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -47,7 +43,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- channel_sources
zlib:
- '1'
8 changes: 1 addition & 7 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
- conda-forge
- conda-forge
- conda-forge
- conda-forge,conda-forge/label/python_rc
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -33,7 +29,7 @@ libprotobuf:
macos_machine:
- x86_64-apple-darwin13.4.0
openssl:
- '3'
- '3.5'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -51,7 +47,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- channel_sources
zlib:
- '1'
8 changes: 1 addition & 7 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
- conda-forge
- conda-forge
- conda-forge
- conda-forge,conda-forge/label/python_rc
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -33,7 +29,7 @@ libprotobuf:
macos_machine:
- arm64-apple-darwin20.0.0
openssl:
- '3'
- '3.5'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -51,7 +47,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- channel_sources
zlib:
- '1'
9 changes: 1 addition & 8 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ c_stdlib:
- vs
channel_sources:
- conda-forge
- conda-forge
- conda-forge
- conda-forge
- conda-forge,conda-forge/label/python_rc
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -21,7 +17,7 @@ libgrpc:
libprotobuf:
- 6.31.1
openssl:
- '3'
- '3.5'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -36,8 +32,5 @@ re2:
- 2025.08.12
target_platform:
- win-64
zip_keys:
- - python
- channel_sources
zlib:
- '1'
19 changes: 19 additions & 0 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

55 changes: 28 additions & 27 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "1.74.1" %}
{% set version = "1.76.0" %}

# core package & vendored libs use different version scheme than CPP libs, see
# top of https://github.com/grpc/grpc/blob/v{{ version }}/CMakeLists.txt
Expand All @@ -19,32 +19,32 @@ package:

source:
- url: https://github.com/grpc/grpc/archive/v{{ version.replace(".pre", "-pre") }}.tar.gz
sha256: 7bf97c11cf3808d650a3a025bbf9c5f922c844a590826285067765dfd055d228
sha256: 0af37b800953130b47c075b56683ee60bdc3eda3c37fc6004193f5b569758204
patches:
- patches/0001-windows-ssl-lib-names.patch
- patches/0002-fix-win-setup-cmds.patch
- patches/0003-Link-against-grpc-and-abseil.patch
- patches/0004-force-protoc-executable.patch
# mark target_link_libraries for grpc as PRIVATE where possible
- patches/0005-mark-linkages-of-grpc-_unsecure-as-private.patch
# fix symbol visibility regression on windows
- patches/0006-for-main-targets-set-_DLL_EXPORTS-when-building-and-.patch
# get gRPC_BUILD_TESTS=ON to build
- patches/0007-add-missing-linkages-for-gRPC_BUILD_TESTS-ON.patch
# see https://github.com/grpc/grpc/pull/38893
- patches/0008-add-enable_testing-so-tests-get-run.patch
# protobuf is now shipping upb, so we cannot ship it here; see
# https://github.com/protocolbuffers/protobuf/issues/12927
# https://github.com/conda-forge/libprotobuf-feedstock/pull/240
# https://github.com/grpc/grpc/commit/7819891fabcd1d2ff55c26c2b0755ab52ccd8e20
- patches/0009-unvendor-upb-and-utf8_range-use-protobuf-s-version.patch
# full test suite takes too long to build; reduce set of tests
- patches/0010-reduce-buildtests_cxx-target-to-end2end-tests.patch
# don't rebuild protobuf/upb/abseil for grpcio-tools
- patches/0011-build-grpcio-tools-from-source.patch
- patches/0012-add-linkage-to-openssl-to-grpc_unsecure.patch # [win]
- patches/0013-reduce-grpc-symbol-explosion-with-autogenerated-expo.patch
- patches/0014-update-GRPC_DLL-instances-where-necessary.patch
#- patches/0001-windows-ssl-lib-names.patch
#- patches/0002-fix-win-setup-cmds.patch
#- patches/0003-Link-against-grpc-and-abseil.patch
#- patches/0004-force-protoc-executable.patch
## mark target_link_libraries for grpc as PRIVATE where possible
#- patches/0005-mark-linkages-of-grpc-_unsecure-as-private.patch
## fix symbol visibility regression on windows
#- patches/0006-for-main-targets-set-_DLL_EXPORTS-when-building-and-.patch
## get gRPC_BUILD_TESTS=ON to build
#- patches/0007-add-missing-linkages-for-gRPC_BUILD_TESTS-ON.patch
## see https://github.com/grpc/grpc/pull/38893
#- patches/0008-add-enable_testing-so-tests-get-run.patch
## protobuf is now shipping upb, so we cannot ship it here; see
## https://github.com/protocolbuffers/protobuf/issues/12927
## https://github.com/conda-forge/libprotobuf-feedstock/pull/240
## https://github.com/grpc/grpc/commit/7819891fabcd1d2ff55c26c2b0755ab52ccd8e20
#- patches/0009-unvendor-upb-and-utf8_range-use-protobuf-s-version.patch
## full test suite takes too long to build; reduce set of tests
#- patches/0010-reduce-buildtests_cxx-target-to-end2end-tests.patch
## don't rebuild protobuf/upb/abseil for grpcio-tools
#- patches/0011-build-grpcio-tools-from-source.patch
#- patches/0012-add-linkage-to-openssl-to-grpc_unsecure.patch # [win]
#- patches/0013-reduce-grpc-symbol-explosion-with-autogenerated-expo.patch
#- patches/0014-update-GRPC_DLL-instances-where-necessary.patch

{% if build_platform == target_platform and not win %}
- folder: third_party/benchmark
Expand All @@ -65,7 +65,7 @@ source:

- folder: third_party/protoc-gen-validate
git_url: https://github.com/envoyproxy/protoc-gen-validate.git
git_rev: 32c2415389a3538082507ae537e7edd9578c64ed
git_rev: 7b06248484ceeaa947e93ca2747eccf336a88ecc

- folder: third_party/xds
git_url: https://github.com/cncf/xds.git
Expand Down Expand Up @@ -193,6 +193,7 @@ outputs:
run:
- python
- {{ pin_subpackage('libgrpc', exact=True) }}
- typing-extensions >=4.12,<5
test:
source_files:
- examples/python/helloworld/
Expand Down
6 changes: 3 additions & 3 deletions recipe/patches/0001-windows-ssl-lib-names.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From d5ed2615f402d4b60de392d7faa49ce7e8fa6513 Mon Sep 17 00:00:00 2001
From d29b0ba4a350941f4ed553ec3236d1a6e2e6a16c Mon Sep 17 00:00:00 2001
From: Jonathan Helmus <[email protected]>
Date: Mon, 17 Feb 2020 15:45:06 -0600
Subject: [PATCH 01/14] windows ssl lib names
Expand All @@ -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 39ca17e824..3a879f037b 100644
index e9823ed..a4f5810 100644
--- a/setup.py
+++ b/setup.py
@@ -367,10 +367,10 @@ if "win32" in sys.platform:
@@ -375,10 +375,10 @@ if "win32" in sys.platform:
"ws2_32",
)
if BUILD_WITH_SYSTEM_OPENSSL:
Expand Down
8 changes: 4 additions & 4 deletions recipe/patches/0002-fix-win-setup-cmds.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From f50311e7ac7f652ac5692f88d92dc0fb9fa6e3c1 Mon Sep 17 00:00:00 2001
From 9bcb9fe868db519f3d3151cfb9462905173b34df Mon Sep 17 00:00:00 2001
From: Mike Sarahan <[email protected]>
Date: Tue, 18 Feb 2020 13:53:05 -0600
Subject: [PATCH 02/14] fix win setup cmds
Expand All @@ -12,10 +12,10 @@ Co-Authored-By: H. Vetinari <[email protected]>
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 3a879f037b..adfec063fd 100644
index a4f5810..5f900fb 100644
--- a/setup.py
+++ b/setup.py
@@ -209,6 +209,9 @@ ENABLE_DOCUMENTATION_BUILD = _env_bool_value(
@@ -211,6 +211,9 @@ ENABLE_DOCUMENTATION_BUILD = _env_bool_value(


def check_linker_need_libatomic():
Expand All @@ -25,7 +25,7 @@ index 3a879f037b..adfec063fd 100644
"""Test if linker on system needs libatomic."""
code_test = (
b"#include <atomic>\n"
@@ -266,9 +269,6 @@ if EXTRA_ENV_COMPILE_ARGS is None:
@@ -274,9 +277,6 @@ if EXTRA_ENV_COMPILE_ARGS is None:
# MSVC by defaults uses C++14 and C89 so both needs to be configured.
EXTRA_ENV_COMPILE_ARGS += " /std:c++17"
EXTRA_ENV_COMPILE_ARGS += " /std:c11"
Expand Down
10 changes: 5 additions & 5 deletions recipe/patches/0003-Link-against-grpc-and-abseil.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 41f565b1cc5a805928c9d7a6542f1e6802a4bfa4 Mon Sep 17 00:00:00 2001
From 9b84f84691c32f0146d8ae531dd19c7ed199e644 Mon Sep 17 00:00:00 2001
From: Marius van Niekerk <[email protected]>
Date: Mon, 13 Jun 2022 17:13:07 -0400
Subject: [PATCH 03/14] Link against grpc and abseil
Expand All @@ -9,10 +9,10 @@ Co-Authored-By: H. Vetinari <[email protected]>
1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index adfec063fd..266a690474 100644
index 5f900fb..26436ba 100644
--- a/setup.py
+++ b/setup.py
@@ -180,6 +180,8 @@ BUILD_WITH_STATIC_LIBSTDCXX = _env_bool_value(
@@ -182,6 +182,8 @@ BUILD_WITH_STATIC_LIBSTDCXX = _env_bool_value(
"GRPC_PYTHON_BUILD_WITH_STATIC_LIBSTDCXX", "False"
)

Expand All @@ -21,7 +21,7 @@ index adfec063fd..266a690474 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
@@ -378,10 +380,20 @@ if BUILD_WITH_SYSTEM_CARES:
@@ -386,10 +388,20 @@ if BUILD_WITH_SYSTEM_CARES:
if BUILD_WITH_SYSTEM_RE2:
EXTENSION_LIBRARIES += ("re2",)
if BUILD_WITH_SYSTEM_ABSL:
Expand All @@ -46,7 +46,7 @@ index adfec063fd..266a690474 100644

DEFINE_MACROS = (("_WIN32_WINNT", 0x600),)
asm_files = []
@@ -493,6 +505,9 @@ def cython_extensions_and_necessity():
@@ -501,6 +513,9 @@ def cython_extensions_and_necessity():
prefix + "libgrpc.a",
]
core_c_files = []
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0004-force-protoc-executable.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 29ede911ee9d4f9096f5719d20103e180271e1cc Mon Sep 17 00:00:00 2001
From c7be067618901e93e49223385d7f6684981a9774 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <[email protected]>
Date: Fri, 11 Sep 2020 14:20:04 +0200
Subject: [PATCH 04/14] force protoc executable
Expand All @@ -8,7 +8,7 @@ Subject: [PATCH 04/14] force protoc executable
1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/cmake/protobuf.cmake b/cmake/protobuf.cmake
index ad80ca6e46..7bae8d95bd 100644
index ad80ca6..7bae8d9 100644
--- a/cmake/protobuf.cmake
+++ b/cmake/protobuf.cmake
@@ -70,21 +70,8 @@ elseif(gRPC_PROTOBUF_PROVIDER STREQUAL "package")
Expand Down
Loading
Loading