From 1e5e7101481bc2351b70c42c986c556d1be930f6 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 21 Jul 2022 00:16:11 +0200 Subject: [PATCH] [grpc] no absolute paths (#25796) --- ports/grpc/portfile.cmake | 5 +++++ ports/grpc/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/grpc.json | 5 +++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index 9f485ff191..c00a1c42b5 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -89,5 +89,10 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() +if (VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +else() + vcpkg_fixup_pkgconfig() +endif() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json index a1c7a0d7a9..e6ec9df373 100644 --- a/ports/grpc/vcpkg.json +++ b/ports/grpc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "grpc", "version-semver": "1.46.3", + "port-version": 1, "description": "An RPC library and framework", "homepage": "https://github.com/grpc/grpc", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 315910deda..9b3aa78372 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2694,7 +2694,7 @@ }, "grpc": { "baseline": "1.46.3", - "port-version": 0 + "port-version": 1 }, "grppi": { "baseline": "0.4.0", diff --git a/versions/g-/grpc.json b/versions/g-/grpc.json index a3968ca625..a0a513fe25 100644 --- a/versions/g-/grpc.json +++ b/versions/g-/grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7db8056216ec23b5d48a44eaab6581c3357c1389", + "version-semver": "1.46.3", + "port-version": 1 + }, { "git-tree": "dabbbee8a5b79662990efb664c6975e2ea548599", "version-semver": "1.46.3",