From 5ab31172429fb8d5504ed287d9892bac183e6c43 Mon Sep 17 00:00:00 2001 From: "yusuke.kadowaki" Date: Wed, 14 Apr 2021 11:31:27 +0900 Subject: [PATCH 1/5] [grpc] Fix x86-windows build issue --- ports/grpc/portfile.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index 8102f449285790..bd9fa1bd91c040 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -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) From 32db12a9ae355e2558477fee0ad7ddff3ba5518a Mon Sep 17 00:00:00 2001 From: "yusuke.kadowaki" Date: Wed, 14 Apr 2021 18:21:14 +0900 Subject: [PATCH 2/5] update versions --- ports/grpc/vcpkg.json | 2 +- versions/g-/grpc.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json index a639cdccbdec34..3266d98f61cc11 100644 --- a/ports/grpc/vcpkg.json +++ b/ports/grpc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "grpc", "version-string": "1.33.1", - "port-version": 3, + "port-version": 1, "description": "An RPC library and framework", "homepage": "https://github.com/grpc/grpc", "dependencies": [ diff --git a/versions/g-/grpc.json b/versions/g-/grpc.json index 9d5f0da112fdbc..24b1774b8af565 100644 --- a/versions/g-/grpc.json +++ b/versions/g-/grpc.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1d0adf4a9c4f719dd9d0d22dd2bd58ba34ff921c", + "git-tree": "ca5a3394ca5add8f0a5f0fd9b264115996e5526d", "version-string": "1.33.1", "port-version": 3 }, From 16868755716393c263dc80b9d883f7050b01d7b1 Mon Sep 17 00:00:00 2001 From: yusuke kadowaki Date: Wed, 14 Apr 2021 22:50:42 +0900 Subject: [PATCH 3/5] Revert vcpkg.json and update version again --- ports/grpc/vcpkg.json | 2 +- versions/g-/grpc.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json index 3266d98f61cc11..a639cdccbdec34 100644 --- a/ports/grpc/vcpkg.json +++ b/ports/grpc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "grpc", "version-string": "1.33.1", - "port-version": 1, + "port-version": 3, "description": "An RPC library and framework", "homepage": "https://github.com/grpc/grpc", "dependencies": [ diff --git a/versions/g-/grpc.json b/versions/g-/grpc.json index 24b1774b8af565..83998c99261d36 100644 --- a/versions/g-/grpc.json +++ b/versions/g-/grpc.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ca5a3394ca5add8f0a5f0fd9b264115996e5526d", + "git-tree": "b379f5dcd4dffcdd3507789365e357941e638b22", "version-string": "1.33.1", "port-version": 3 }, From 0758beab89faec1661ea875d7c138152da3b07db Mon Sep 17 00:00:00 2001 From: "yusuke.kadowaki" Date: Thu, 15 Apr 2021 10:23:44 +0900 Subject: [PATCH 4/5] Fix versioning --- ports/grpc/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json index a639cdccbdec34..5a61f9ae5178d8 100644 --- a/ports/grpc/vcpkg.json +++ b/ports/grpc/vcpkg.json @@ -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": [ From 0c2c671292a314f0138bf0b703e506058a655dc6 Mon Sep 17 00:00:00 2001 From: "yusuke.kadowaki" Date: Thu, 15 Apr 2021 10:24:39 +0900 Subject: [PATCH 5/5] Update the version files --- versions/baseline.json | 2 +- versions/g-/grpc.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 8ec59ecb7fabce..f3938e44e9bbfe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2346,7 +2346,7 @@ }, "grpc": { "baseline": "1.33.1", - "port-version": 3 + "port-version": 4 }, "grppi": { "baseline": "0.4.0", diff --git a/versions/g-/grpc.json b/versions/g-/grpc.json index 83998c99261d36..d471a4f95964db 100644 --- a/versions/g-/grpc.json +++ b/versions/g-/grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "59fb7c6053bb8e085c90d753e2fd63f21fd61220", + "version-string": "1.33.1", + "port-version": 4 + }, { "git-tree": "b379f5dcd4dffcdd3507789365e357941e638b22", "version-string": "1.33.1",