Skip to content
Draft
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
4 changes: 3 additions & 1 deletion .azure-pipelines/azure-pipelines-osx.yml

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

22 changes: 0 additions & 22 deletions .ci_support/migrations/absl_grpc_proto.yaml

This file was deleted.

42 changes: 0 additions & 42 deletions .ci_support/migrations/absl_grpc_proto_25Q2.yaml

This file was deleted.

30 changes: 0 additions & 30 deletions .ci_support/migrations/absl_grpc_proto_25Q3.yaml

This file was deleted.

3 changes: 1 addition & 2 deletions LICENSE.txt

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

2 changes: 1 addition & 1 deletion azure-pipelines.yml

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

1 change: 1 addition & 0 deletions build-locally.py

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

8 changes: 4 additions & 4 deletions recipe/build-cpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ if [[ "$CONDA_BUILD_CROSS_COMPILATION" == 1 ]]; then
# don't build tests in cross-compilation; cannot run them anyway
export CMAKE_ARGS="${CMAKE_ARGS} -DgRPC_BUILD_TESTS=OFF"
else
export CMAKE_ARGS="${CMAKE_ARGS} -DgRPC_CF_TESTS=ON"
export CMAKE_ARGS="${CMAKE_ARGS} -DgRPC_CF_TESTS=OFF"
fi

if [[ "${target_platform}" == osx-* ]]; then
Expand Down Expand Up @@ -101,9 +101,9 @@ cmake -GNinja \

cmake --build . -j${CPU_COUNT}

if [[ "$CONDA_BUILD_CROSS_COMPILATION" != 1 ]]; then
ctest --progress --output-on-failure
fi
# if [[ "$CONDA_BUILD_CROSS_COMPILATION" != 1 ]]; then
# ctest --progress --output-on-failure
# fi

cmake --install .
popd
2 changes: 1 addition & 1 deletion recipe/build-grpcio.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
if "%ARCH%" == "32" (set PLATFORM=x86) else (set PLATFORM=x64)
@echo on

set "GRPC_BUILD_WITH_BORING_SSL_ASM="
set "GRPC_PYTHON_BUILD_SYSTEM_ABSL=True"
Expand Down
17 changes: 13 additions & 4 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "1.78.0" %}
{% set version = "1.78.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: e2ace790a5f2d0f83259d1390a816a33b013ea34df2e86084d927e58daa4c5d9
sha256: 961a44a2a5a50670e58f5e887c17fe70529253da23802245326d681f6d8d1ba6
patches:
- patches/0001-windows-ssl-lib-names.patch
- patches/0002-fix-win-setup-cmds.patch
Expand All @@ -46,6 +46,11 @@ source:
- patches/0013-update-GRPC_DLL-instances-where-necessary.patch
- patches/0014-use-protobuf-s-libutf8_range.patch
- patches/0015-disable-grpc-_unsecure.patch
# backport https://github.com/grpc/grpc/pull/41705
- patches/0016-update-docstrings-referring-to-non-existent-grpc.com.patch
# for https://github.com/grpc/grpc/issues/41672
- patches/0017-break-out-init-for-grpc-abseil-logging-into-separate.patch
- patches/0018-avoid-multiple-calls-to-grpc_init-in-grpcio.patch

{% if build_platform == target_platform and not win %}
- folder: third_party/benchmark
Expand Down Expand Up @@ -74,7 +79,7 @@ source:
{% endif %}

build:
number: 1
number: 0

outputs:
- name: libgrpc
Expand Down Expand Up @@ -240,14 +245,18 @@ outputs:
- cp ../../../test_grpcio_helloworld.py .
- python test_grpcio_helloworld.py
{% endif %}
- export GRPC_PYTHON_DISABLE_ABSL_INIT_LOG=1 # [unix]
- set GRPC_PYTHON_DISABLE_ABSL_INIT_LOG=1 # [win]
- python "${SRC_DIR}/grpcio_distribtest.py" # [unix]
- python %SRC_DIR%\grpcio_distribtest.py # [win]

- name: grpcio-tools
build:
script:
- cd tools/distrib/python/grpcio_tools
- export GRPC_PYTHON_BUILD_WITH_CYTHON=true # [unix]
- set GRPC_PYTHON_BUILD_WITH_CYTHON=true # [win]
- python -m pip install . -vv
- python -m pip install . --no-build-isolation -vv
requirements:
build:
- python # [build_platform != target_platform]
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,7 +1,7 @@
From a11f81a1fed0a90fab9d2d086162048bcab87465 Mon Sep 17 00:00:00 2001
From a760a4e68d147bbbba925dd6b7bdf03259f1ef9a Mon Sep 17 00:00:00 2001
From: Jonathan Helmus <jjhelmus@gmail.com>
Date: Mon, 17 Feb 2020 15:45:06 -0600
Subject: [PATCH 01/15] windows ssl lib names
Subject: [PATCH 01/18] windows ssl lib names

Co-Authored-By: Julien Schueller <schueller@phimeca.com>
Co-Authored-By: Nicholas Bollweg <nick.bollweg@gmail.com>
Expand All @@ -11,7 +11,7 @@ Co-Authored-By: Marius van Niekerk <marius.v.niekerk@gmail.com>
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 38d3ab7229..e0f0572512 100644
index 6ff80ee32b..5fc650018f 100644
--- a/setup.py
+++ b/setup.py
@@ -367,10 +367,10 @@ if "win32" in sys.platform:
Expand Down
6 changes: 3 additions & 3 deletions recipe/patches/0002-fix-win-setup-cmds.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 79815959c268d834215cf6d8efd128c9370dcc6f Mon Sep 17 00:00:00 2001
From 31eb01d54fd47e56cc29c4dcce750077d5ea735e Mon Sep 17 00:00:00 2001
From: Mike Sarahan <msarahan@gmail.com>
Date: Tue, 18 Feb 2020 13:53:05 -0600
Subject: [PATCH 02/15] fix win setup cmds
Subject: [PATCH 02/18] fix win setup cmds

Co-Authored-By: Julien Schueller <schueller@phimeca.com>
Co-Authored-By: Nicholas Bollweg <nick.bollweg@gmail.com>
Expand All @@ -12,7 +12,7 @@ Co-Authored-By: H. Vetinari <h.vetinari@gmx.com>
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index e0f0572512..70f301db5b 100644
index 5fc650018f..e42b6d85a2 100644
--- a/setup.py
+++ b/setup.py
@@ -203,6 +203,9 @@ ENABLE_DOCUMENTATION_BUILD = _env_bool_value(
Expand Down
20 changes: 14 additions & 6 deletions recipe/patches/0003-Link-against-grpc-and-abseil.patch
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
From b6c77c3f37ddfb44b902876451e15c8a64cb5d73 Mon Sep 17 00:00:00 2001
From 150f4c474b1310c2e53ad0a87b98e9693ee1e87f Mon Sep 17 00:00:00 2001
From: Marius van Niekerk <marius.v.niekerk@gmail.com>
Date: Mon, 13 Jun 2022 17:13:07 -0400
Subject: [PATCH 03/15] Link against grpc and abseil
Subject: [PATCH 03/18] Link against grpc and abseil

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

diff --git a/setup.py b/setup.py
index 70f301db5b..8ef5add234 100644
index e42b6d85a2..33734daf7b 100644
--- a/setup.py
+++ b/setup.py
@@ -174,6 +174,8 @@ BUILD_WITH_STATIC_LIBSTDCXX = _env_bool_value(
Expand Down Expand Up @@ -46,7 +46,7 @@ index 70f301db5b..8ef5add234 100644

DEFINE_MACROS = (("_WIN32_WINNT", 0x600),)
asm_files = []
@@ -493,6 +505,9 @@ def cython_extensions_and_necessity():
@@ -504,6 +516,9 @@ def cython_extensions_and_necessity():
prefix + "libgrpc.a",
]
core_c_files = []
Expand All @@ -56,3 +56,11 @@ index 70f301db5b..8ef5add234 100644
else:
core_c_files = list(CORE_C_FILES)
extra_objects = []
@@ -515,7 +530,6 @@ def cython_extensions_and_necessity():
+ list(CYTHON_HELPER_C_FILES)
+ core_c_files
+ asm_files
- + ["third_party/abseil-cpp/absl/log/initialize.cc"]
),
include_dirs=list(EXTENSION_INCLUDE_DIRECTORIES),
libraries=list(EXTENSION_LIBRARIES),
4 changes: 2 additions & 2 deletions recipe/patches/0004-force-protoc-executable.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0794920933616c1e35a5f147568e89f745da97cd Mon Sep 17 00:00:00 2001
From cef9dba1a11445cc2c5adb90425ec77e2501056c Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <uwe.korn@quantco.com>
Date: Fri, 11 Sep 2020 14:20:04 +0200
Subject: [PATCH 04/15] force protoc executable
Subject: [PATCH 04/18] force protoc executable

---
cmake/protobuf.cmake | 17 ++---------------
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 31aa408f807e2ed0f8b7c4bc53afab569f24193d Mon Sep 17 00:00:00 2001
From 6679d56c5e3a14e2b5597539c44679ca711418c1 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Tue, 23 Aug 2022 11:45:20 +0200
Subject: [PATCH 05/15] mark linkages of grpc{,_unsecure} as private
Subject: [PATCH 05/18] mark linkages of grpc{,_unsecure} as private

except openssl & gpr, which are needed by dependents

Expand All @@ -13,7 +13,7 @@ Co-Authored-By: Mark Harfouche <mark.harfouche@gmail.com>
1 file changed, 58 insertions(+), 48 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c7e3d4893..72de82042f 100644
index 3d2afd9651..a4a105af29 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3137,34 +3137,39 @@ target_include_directories(grpc
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
From 62476b9981d5feae6fce20a51d34bea82d7f0d7e Mon Sep 17 00:00:00 2001
From 8d5ea95126eaddf66c628b7044eb73fa00e41887 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Thu, 29 Feb 2024 20:31:21 +1100
Subject: [PATCH 06/15] for main targets, set *_DLL_EXPORTS when building and
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 72de82042f..853ad4a773 100644
index a4a105af29..2bf0a3077b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2103,10 +2103,8 @@ if(WIN32 AND MSVC)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From a421a5d3dc639ea527058b43101e21ca7d24f773 Mon Sep 17 00:00:00 2001
From 6ffa683ef2e30164b4f34356ee6a63d78532415b Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Tue, 26 Sep 2023 18:25:54 +1100
Subject: [PATCH 07/15] add missing linkages for gRPC_BUILD_TESTS=ON
Subject: [PATCH 07/18] add missing linkages for gRPC_BUILD_TESTS=ON

grpc_event_engine::experimental::MockEndpoint::MockEndpoint() sits in
https://github.com/grpc/grpc/blob/v1.73.1/test/core/test_util/mock_endpoint.cc
Expand All @@ -14,7 +14,7 @@ For some tests, re2 and c-ares have just been forgotten as dependencies.
1 file changed, 11 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 853ad4a773..69b05fe6b7 100644
index 2bf0a3077b..2a086acfbc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3297,6 +3297,7 @@ target_link_libraries(grpc_test_util
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From c052d68c95a97507e707c1dd37ea07101abd9b82 Mon Sep 17 00:00:00 2001
From 01c3783c541b8a43045e80bfde88b936522abd2f Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Fri, 28 Feb 2025 22:07:19 +1100
Subject: [PATCH 08/15] add enable_testing so tests get run
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 69b05fe6b7..34fef71c84 100644
index 2a086acfbc..71bb6e3a72 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,6 +51,10 @@ option(gRPC_BUILD_TESTS "Build tests" OFF)
Expand Down
Loading
Loading