Skip to content

[grpc] Fix x86-windows build issue #17276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ykadowak wants to merge 5 commits into from
Closed

[grpc] Fix x86-windows build issue #17276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5ab3117
[grpc] Fix x86-windows build issue
Apr 14, 2021
32db12a
update versions
Apr 14, 2021
1686875
Revert vcpkg.json and update version again
ykadowak Apr 14, 2021
0758bea
Fix versioning
Apr 15, 2021
0c2c671
Update the version files
Apr 15, 2021
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: 3 additions & 3 deletions ports/grpc/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ vcpkg_from_github(
00012-fix-use-cxx17.patch
)

if(TARGET_TRIPLET STREQUAL HOST_TRIPLET)
set(gRPC_BUILD_CODEGEN ON)
else()
if((NOT VCPKG_TARGET_IS_LINUX AND NOT VCPKG_TARGET_IS_OSX) AND (VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64"))
set(gRPC_BUILD_CODEGEN OFF)
vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/grpc")
else()
set(gRPC_BUILD_CODEGEN ON)
endif()

string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" gRPC_MSVC_STATIC_RUNTIME)
Expand Down
2 changes: 1 addition & 1 deletion ports/grpc/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "grpc",
"version-string": "1.33.1",
"port-version": 3,
"port-version": 4,
"description": "An RPC library and framework",
"homepage": "https://github.com/grpc/grpc",
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2346,7 +2346,7 @@
},
"grpc": {
"baseline": "1.33.1",
"port-version": 3
"port-version": 4
},
"grppi": {
"baseline": "0.4.0",
Expand Down
7 changes: 6 additions & 1 deletion versions/g-/grpc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
{
"versions": [
{
"git-tree": "1d0adf4a9c4f719dd9d0d22dd2bd58ba34ff921c",
"git-tree": "59fb7c6053bb8e085c90d753e2fd63f21fd61220",
"version-string": "1.33.1",
"port-version": 4
},
{
"git-tree": "b379f5dcd4dffcdd3507789365e357941e638b22",
"version-string": "1.33.1",
"port-version": 3
},
Expand Down