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
6 changes: 0 additions & 6 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 Down Expand Up @@ -47,7 +43,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- channel_sources
zlib:
- '1'
6 changes: 0 additions & 6 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 Down Expand Up @@ -47,7 +43,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- channel_sources
zlib:
- '1'
6 changes: 0 additions & 6 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 Down Expand Up @@ -47,7 +43,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- channel_sources
zlib:
- '1'
6 changes: 0 additions & 6 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 Down Expand Up @@ -51,7 +47,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- channel_sources
zlib:
- '1'
6 changes: 0 additions & 6 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 Down Expand Up @@ -51,7 +47,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- channel_sources
zlib:
- '1'
7 changes: 0 additions & 7 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 @@ -36,8 +32,5 @@ re2:
- 2025.08.12
target_platform:
- win-64
zip_keys:
- - python
- channel_sources
zlib:
- '1'
5 changes: 3 additions & 2 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.75.1" %}

# 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,7 +19,7 @@ package:

source:
- url: https://github.com/grpc/grpc/archive/v{{ version.replace(".pre", "-pre") }}.tar.gz
sha256: 7bf97c11cf3808d650a3a025bbf9c5f922c844a590826285067765dfd055d228
sha256: 486d5e32b3627926476a9a472f9792e4d7fe4e89c962473f1296183f76c6b032
patches:
- patches/0001-windows-ssl-lib-names.patch
- patches/0002-fix-win-setup-cmds.patch
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 d31df2e44c72e00b4eed156e9b56838c2ce4d409 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 503cc2b4fa..152645b1df 100644
--- a/setup.py
+++ b/setup.py
@@ -367,10 +367,10 @@ if "win32" in sys.platform:
@@ -369,10 +369,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 f10a11f6412dfa21e547dc72d9e01f8bba5cabb3 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 152645b1df..a73cc24346 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:
@@ -268,9 +271,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 906c60346084305e436287fb06da86c6debd0216 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 a73cc24346..824d8aa016 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:
@@ -380,10 +382,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():
@@ -495,6 +507,9 @@ def cython_extensions_and_necessity():
prefix + "libgrpc.a",
]
core_c_files = []
Expand Down
2 changes: 1 addition & 1 deletion 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 1e09c50f603babd53c47fe68c55ded23744cf4e0 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 Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 5cad386388ee72810dfcbf0afc88ded797f5e840 Mon Sep 17 00:00:00 2001
From 19f402ca8c02c116a3865fd376f2b4d90b96bfeb Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <[email protected]>
Date: Tue, 23 Aug 2022 11:45:20 +0200
Subject: [PATCH 05/14] mark linkages of grpc{,_unsecure} as private
Expand All @@ -13,10 +13,10 @@ Co-Authored-By: Mark Harfouche <[email protected]>
1 file changed, 60 insertions(+), 50 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f652a4055c..2fae60378f 100644
index 67f7511a4e..45badf99e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3069,35 +3069,40 @@ target_include_directories(grpc
@@ -3097,35 +3097,40 @@ target_include_directories(grpc
${_gRPC_ZLIB_INCLUDE_DIR}
)
target_link_libraries(grpc
Expand Down Expand Up @@ -84,7 +84,7 @@ index f652a4055c..2fae60378f 100644
endif()

foreach(_hdr
@@ -3791,32 +3796,37 @@ target_include_directories(grpc_unsecure
@@ -3824,32 +3829,37 @@ target_include_directories(grpc_unsecure
${_gRPC_ZLIB_INCLUDE_DIR}
)
target_link_libraries(grpc_unsecure
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 7ee05652cf15c9d23b634bfe9fc18028d62e32c1 Mon Sep 17 00:00:00 2001
From fd5fcee8d84cf4b1a2370ce6230eb3bf77487925 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <[email protected]>
Date: Thu, 29 Feb 2024 20:31:21 +1100
Subject: [PATCH 06/14] for main targets, set *_DLL_EXPORTS when building and
Expand All @@ -9,10 +9,10 @@ Subject: [PATCH 06/14] for main targets, set *_DLL_EXPORTS when building and
1 file changed, 10 insertions(+), 26 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fae60378f..66be39ef73 100644
index 45badf99e6..73e4150f76 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2063,10 +2063,8 @@ if(WIN32 AND MSVC)
@@ -2080,10 +2080,8 @@ if(WIN32 AND MSVC)
COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
)
if(BUILD_SHARED_LIBS)
Expand All @@ -25,7 +25,7 @@ index 2fae60378f..66be39ef73 100644
endif()
if(gRPC_INSTALL)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gpr.pdb
@@ -3042,11 +3040,8 @@ if(WIN32 AND MSVC)
@@ -3070,11 +3068,8 @@ if(WIN32 AND MSVC)
COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
)
if(BUILD_SHARED_LIBS)
Expand All @@ -39,7 +39,7 @@ index 2fae60378f..66be39ef73 100644
endif()
if(gRPC_INSTALL)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc.pdb
@@ -3769,11 +3764,8 @@ if(WIN32 AND MSVC)
@@ -3802,11 +3797,8 @@ if(WIN32 AND MSVC)
COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
)
if(BUILD_SHARED_LIBS)
Expand All @@ -53,7 +53,7 @@ index 2fae60378f..66be39ef73 100644
endif()
if(gRPC_INSTALL)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_unsecure.pdb
@@ -4791,12 +4783,8 @@ if(WIN32 AND MSVC)
@@ -4824,12 +4816,8 @@ if(WIN32 AND MSVC)
COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
)
if(BUILD_SHARED_LIBS)
Expand All @@ -68,7 +68,7 @@ index 2fae60378f..66be39ef73 100644
endif()
if(gRPC_INSTALL)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc++.pdb
@@ -5531,12 +5519,8 @@ if(WIN32 AND MSVC)
@@ -5568,12 +5556,8 @@ if(WIN32 AND MSVC)
COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
)
if(BUILD_SHARED_LIBS)
Expand Down
Loading
Loading