Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler:
cxx_compiler_version:
- '14'
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
- quay.io/condaforge/linux-anvil-x86_64:alma10
libabseil:
- '20260526'
libgrpc:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler:
cxx_compiler_version:
- '14'
docker_image:
- quay.io/condaforge/linux-anvil-aarch64:alma9
- quay.io/condaforge/linux-anvil-aarch64:alma10
libabseil:
- '20260526'
libgrpc:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler:
cxx_compiler_version:
- '14'
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
- quay.io/condaforge/linux-anvil-x86_64:alma10
libabseil:
- '20260526'
libgrpc:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/conda-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
matrix:
include:
- CONFIG: linux_64_
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10
STORE_BUILD_ARTIFACTS: False
UPLOAD_PACKAGES: True
build_workspace_dir: build_artifacts
Expand All @@ -35,7 +35,7 @@ jobs:
runs_on: ['ubuntu-latest']
tools_install_dir: ~/miniforge3
- CONFIG: linux_aarch64_
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma9
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma10
STORE_BUILD_ARTIFACTS: False
UPLOAD_PACKAGES: True
build_workspace_dir: build_artifacts
Expand All @@ -47,7 +47,7 @@ jobs:
runs_on: ['ubuntu-24.04-arm']
tools_install_dir: ~/miniforge3
- CONFIG: linux_ppc64le_
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10
STORE_BUILD_ARTIFACTS: False
UPLOAD_PACKAGES: True
build_workspace_dir: build_artifacts
Expand Down
4 changes: 2 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "1.82.1" %}
{% set version = "1.83.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,7 +19,7 @@ package:

source:
- url: https://github.com/grpc/grpc/archive/v{{ version.replace(".pre", "-pre") }}.tar.gz
sha256: d74186d8fa221cc7f07ec2db970098302559f73612f6cf340cfe754848c4fc29
sha256: 90d453393a9d41215df546103b10b33b9566df79cdf6f49dc67f6c4d044d090d
patches:
- patches/0001-windows-ssl-lib-names.patch
- patches/0002-fix-win-setup-cmds.patch
Expand Down
12 changes: 5 additions & 7 deletions recipe/patches/0001-windows-ssl-lib-names.patch
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,12 @@ Co-Authored-By: Julien Schueller <schueller@phimeca.com>
Co-Authored-By: Nicholas Bollweg <nick.bollweg@gmail.com>
Co-Authored-By: Marius van Niekerk <marius.v.niekerk@gmail.com>
---
setup.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 28860ecf65..7f46c442b9 100644
--- a/setup.py
+++ b/setup.py
@@ -381,10 +381,10 @@ if "win32" in sys.platform:
diff --git c/setup.py i/setup.py
index 7662934..9838d83 100644
--- c/setup.py
+++ i/setup.py
@@ -390,10 +390,10 @@ if "win32" in sys.platform:
"ws2_32",
)
if BUILD_WITH_SYSTEM_OPENSSL:
Expand Down
10 changes: 4 additions & 6 deletions recipe/patches/0002-fix-win-setup-cmds.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@ Co-Authored-By: Nicholas Bollweg <nick.bollweg@gmail.com>
Co-Authored-By: Marius van Niekerk <marius.v.niekerk@gmail.com>
Co-Authored-By: H. Vetinari <h.vetinari@gmx.com>
---
setup.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 7f46c442b9..d8e9bc256d 100644
--- a/setup.py
+++ b/setup.py
diff --git c/setup.py i/setup.py
index 9838d83..888e684 100644
--- c/setup.py
+++ i/setup.py
@@ -201,6 +201,9 @@ ENABLE_DOCUMENTATION_BUILD = _env_bool_value(


Expand Down
16 changes: 7 additions & 9 deletions recipe/patches/0003-Link-against-grpc-and-abseil.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@ Subject: [PATCH 03/18] Link against grpc and abseil

Co-Authored-By: H. Vetinari <h.vetinari@gmx.com>
---
setup.py | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/setup.py b/setup.py
index d8e9bc256d..dbd69dc50e 100644
--- a/setup.py
+++ b/setup.py
diff --git c/setup.py i/setup.py
index 888e684..f6e1716 100644
--- c/setup.py
+++ i/setup.py
@@ -172,6 +172,8 @@ BUILD_WITH_STATIC_LIBSTDCXX = _env_bool_value(
"GRPC_PYTHON_BUILD_WITH_STATIC_LIBSTDCXX", "False"
)
Expand All @@ -21,7 +19,7 @@ index d8e9bc256d..dbd69dc50e 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
@@ -392,10 +394,20 @@ if BUILD_WITH_SYSTEM_CARES:
@@ -401,10 +403,20 @@ if BUILD_WITH_SYSTEM_CARES:
if BUILD_WITH_SYSTEM_RE2:
EXTENSION_LIBRARIES += ("re2",)
if BUILD_WITH_SYSTEM_ABSL:
Expand All @@ -46,7 +44,7 @@ index d8e9bc256d..dbd69dc50e 100644

DEFINE_MACROS = (("_WIN32_WINNT", 0x600),)
asm_files = []
@@ -507,6 +519,9 @@ def cython_extensions_and_necessity():
@@ -512,6 +524,9 @@ def cython_extensions_and_necessity():
prefix + "libgrpc.a",
]
core_c_files = []
Expand All @@ -56,7 +54,7 @@ index d8e9bc256d..dbd69dc50e 100644
else:
core_c_files = list(CORE_C_FILES)
extra_objects = []
@@ -518,7 +533,6 @@ def cython_extensions_and_necessity():
@@ -523,7 +538,6 @@ def cython_extensions_and_necessity():
+ list(GRPCIO_CC_SRCS)
+ core_c_files
+ asm_files
Expand Down
10 changes: 6 additions & 4 deletions recipe/patches/0004-force-protoc-executable.patch
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ Subject: [PATCH 04/18] 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 ad80ca6e46..7bae8d95bd 100644
--- a/cmake/protobuf.cmake
+++ b/cmake/protobuf.cmake
---

diff --git c/cmake/protobuf.cmake i/cmake/protobuf.cmake
index ad80ca6..7bae8d9 100644
--- c/cmake/protobuf.cmake
+++ i/cmake/protobuf.cmake
@@ -70,21 +70,8 @@ elseif(gRPC_PROTOBUF_PROVIDER STREQUAL "package")
endif()
# Well-known proto files are expected to be in the Protobuf include directory.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@ See also: https://github.com/grpc/grpc/issues/30838

Co-Authored-By: Mark Harfouche <mark.harfouche@gmail.com>
---
CMakeLists.txt | 106 +++++++++++++++++++++++++++----------------------
1 file changed, 58 insertions(+), 48 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27bb372c2e..46cdc6d35f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3182,34 +3182,39 @@ target_include_directories(grpc
diff --git c/CMakeLists.txt i/CMakeLists.txt
index 6499b7c..e3a591e 100644
--- c/CMakeLists.txt
+++ i/CMakeLists.txt
@@ -3189,34 +3189,39 @@ target_include_directories(grpc
${_gRPC_ZLIB_INCLUDE_DIR}
)
target_link_libraries(grpc
Expand Down Expand Up @@ -82,7 +80,7 @@ index 27bb372c2e..46cdc6d35f 100644
endif()

foreach(_hdr
@@ -3924,31 +3929,36 @@ target_include_directories(grpc_unsecure
@@ -3932,31 +3937,36 @@ 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
Expand Up @@ -5,14 +5,12 @@ Subject: [PATCH 06/18] for main targets, set *_DLL_EXPORTS when building and
*_DLL_IMPORTS in interface

---
CMakeLists.txt | 36 ++++++++++--------------------------
1 file changed, 10 insertions(+), 26 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46cdc6d35f..7972c30b19 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2125,10 +2125,8 @@ if(WIN32 AND MSVC)
diff --git c/CMakeLists.txt i/CMakeLists.txt
index e3a591e..44c5b7f 100644
--- c/CMakeLists.txt
+++ i/CMakeLists.txt
@@ -2129,10 +2129,8 @@ if(WIN32 AND MSVC)
COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
)
if(BUILD_SHARED_LIBS)
Expand All @@ -25,7 +23,7 @@ index 46cdc6d35f..7972c30b19 100644
endif()
if(gRPC_INSTALL)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gpr.pdb
@@ -3155,11 +3153,8 @@ if(WIN32 AND MSVC)
@@ -3162,11 +3160,8 @@ if(WIN32 AND MSVC)
COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
)
if(BUILD_SHARED_LIBS)
Expand All @@ -39,7 +37,7 @@ index 46cdc6d35f..7972c30b19 100644
endif()
if(gRPC_INSTALL)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc.pdb
@@ -3902,11 +3897,8 @@ if(WIN32 AND MSVC)
@@ -3910,11 +3905,8 @@ if(WIN32 AND MSVC)
COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
)
if(BUILD_SHARED_LIBS)
Expand All @@ -53,7 +51,7 @@ index 46cdc6d35f..7972c30b19 100644
endif()
if(gRPC_INSTALL)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_unsecure.pdb
@@ -5018,12 +5010,8 @@ if(WIN32 AND MSVC)
@@ -5026,12 +5018,8 @@ if(WIN32 AND MSVC)
COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
)
if(BUILD_SHARED_LIBS)
Expand All @@ -68,7 +66,7 @@ index 46cdc6d35f..7972c30b19 100644
endif()
if(gRPC_INSTALL)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc++.pdb
@@ -5767,12 +5755,8 @@ if(WIN32 AND MSVC)
@@ -5775,12 +5763,8 @@ if(WIN32 AND MSVC)
COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
)
if(BUILD_SHARED_LIBS)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,94 +10,92 @@ is not missing in some other library's link interface, this is the right place.

For some tests, re2 and c-ares have just been forgotten as dependencies.
---
CMakeLists.txt | 11 +++++++++++
1 file changed, 11 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7972c30b19..ce9fa4c402 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3345,6 +3345,7 @@ target_link_libraries(grpc_test_util
diff --git c/CMakeLists.txt i/CMakeLists.txt
index 44c5b7f..ef81114 100644
--- c/CMakeLists.txt
+++ i/CMakeLists.txt
@@ -3352,6 +3352,7 @@ target_link_libraries(grpc_test_util
${_gRPC_ALLTARGETS_LIBRARIES}
absl::failure_signal_handler
absl::stacktrace
+ absl::statusor
absl::symbolize
absl::log_initialize
grpc
@@ -3419,6 +3420,7 @@ target_link_libraries(grpc_test_util_unsecure
@@ -3426,6 +3427,7 @@ target_link_libraries(grpc_test_util_unsecure
${_gRPC_ALLTARGETS_LIBRARIES}
absl::failure_signal_handler
absl::stacktrace
+ absl::statusor
absl::symbolize
absl::log_initialize
grpc_unsecure
@@ -8713,6 +8715,7 @@ target_include_directories(authorization_matchers_test
@@ -8721,6 +8723,7 @@ target_include_directories(authorization_matchers_test
)

target_link_libraries(authorization_matchers_test
+ ${_gRPC_RE2_LIBRARIES}
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
grpc_test_util
@@ -19567,6 +19570,7 @@ target_include_directories(grpc_authorization_engine_test
@@ -19590,6 +19593,7 @@ target_include_directories(grpc_authorization_engine_test
)

target_link_libraries(grpc_authorization_engine_test
+ ${_gRPC_RE2_LIBRARIES}
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
grpc_test_util
@@ -21833,6 +21837,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
@@ -21898,6 +21902,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
)

target_link_libraries(httpcli_test
+ ${_gRPC_CARES_LIBRARIES}
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
grpc++_test_util
@@ -25092,6 +25097,7 @@ target_include_directories(matchers_test
@@ -25157,6 +25162,7 @@ target_include_directories(matchers_test
)

target_link_libraries(matchers_test
+ ${_gRPC_RE2_LIBRARIES}
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
grpc_test_util
@@ -30726,6 +30732,7 @@ target_include_directories(resolve_address_using_ares_resolver_test
@@ -30792,6 +30798,7 @@ target_include_directories(resolve_address_using_ares_resolver_test
)

target_link_libraries(resolve_address_using_ares_resolver_test
+ ${_gRPC_CARES_LIBRARIES}
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
grpc_test_util
@@ -30814,6 +30821,7 @@ target_include_directories(resolve_address_using_native_resolver_test
@@ -30880,6 +30887,7 @@ target_include_directories(resolve_address_using_native_resolver_test
)

target_link_libraries(resolve_address_using_native_resolver_test
+ ${_gRPC_CARES_LIBRARIES}
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
grpc_test_util
@@ -41964,6 +41972,7 @@ target_include_directories(xds_common_types_test
@@ -42397,6 +42405,7 @@ target_include_directories(xds_common_types_test
)

target_link_libraries(xds_common_types_test
+ ${_gRPC_RE2_LIBRARIES}
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
absl::fixed_array
@@ -43192,6 +43201,7 @@ target_include_directories(xds_credentials_test
@@ -43625,6 +43634,7 @@ target_include_directories(xds_credentials_test
)

target_link_libraries(xds_credentials_test
+ ${_gRPC_RE2_LIBRARIES}
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
grpc_test_util
@@ -48378,6 +48388,7 @@ target_include_directories(xds_listener_resource_type_test
@@ -48811,6 +48821,7 @@ target_include_directories(xds_listener_resource_type_test
)

target_link_libraries(xds_listener_resource_type_test
Expand Down
10 changes: 6 additions & 4 deletions recipe/patches/0008-add-enable_testing-so-tests-get-run.patch
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ Subject: [PATCH 08/18] add enable_testing so tests get run
CMakeLists.txt | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce9fa4c402..60e0b95f8a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
---

diff --git c/CMakeLists.txt i/CMakeLists.txt
index ef81114..eb3c02d 100644
--- c/CMakeLists.txt
+++ i/CMakeLists.txt
@@ -51,6 +51,10 @@ option(gRPC_BUILD_TESTS "Build tests" OFF)
option(gRPC_BUILD_CODEGEN "Build codegen" ON)
option(gRPC_DOWNLOAD_ARCHIVES "Download archives for empty 3rd party directories" ON)
Expand Down
Loading