From c379c64ff9ec1b8c6100ebff8e81ecdcb49b330c Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Wed, 8 Jun 2022 04:57:51 +0800 Subject: [PATCH] [crashpad] Fix can't find build/build_config.h (#25106) * [crashpad] Fix can't find build/build_config.h * x-add-version * remove crashpad:x64-linux=fail form ci.baseline.txt Co-authored-by: Lily Wang --- ports/crashpad/portfile.cmake | 2 +- ports/crashpad/vcpkg.json | 1 + scripts/ci.baseline.txt | 1 - versions/baseline.json | 2 +- versions/c-/crashpad.json | 5 +++++ 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/crashpad/portfile.cmake b/ports/crashpad/portfile.cmake index 6c8eb1f35f..a8b5c6b710 100644 --- a/ports/crashpad/portfile.cmake +++ b/ports/crashpad/portfile.cmake @@ -122,7 +122,7 @@ file(REMOVE_RECURSE configure_file("${CMAKE_CURRENT_LIST_DIR}/crashpadConfig.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/crashpadConfig.cmake" @ONLY) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/${PORT}/build") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/${PORT}/build/config") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/${PORT}/util/mach/__pycache__") vcpkg_copy_pdbs() diff --git a/ports/crashpad/vcpkg.json b/ports/crashpad/vcpkg.json index c506e34094..13c15178c1 100644 --- a/ports/crashpad/vcpkg.json +++ b/ports/crashpad/vcpkg.json @@ -1,6 +1,7 @@ { "name": "crashpad", "version-date": "2022-04-16", + "port-version": 1, "description": [ "Crashpad is a crash-reporting system.", "Crashpad is a library for capturing, storing and transmitting postmortem crash reports from a client to an upstream collection server. Crashpad aims to make it possible for clients to capture process state at the time of crash with the best possible fidelity and coverage, with the minimum of fuss." diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index aecaf81aba..f427edb2f8 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -177,7 +177,6 @@ cppcoro:x64-uwp=fail cppgraphqlgen:x64-linux=fail crashpad:arm64-windows=fail crashpad:arm-uwp=fail -crashpad:x64-linux=fail crashpad:x86-windows=fail ctemplate:x64-linux=fail ctemplate:x64-osx=fail diff --git a/versions/baseline.json b/versions/baseline.json index d1d6e0b131..9757917e19 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1682,7 +1682,7 @@ }, "crashpad": { "baseline": "2022-04-16", - "port-version": 0 + "port-version": 1 }, "crashrpt": { "baseline": "1.4.3", diff --git a/versions/c-/crashpad.json b/versions/c-/crashpad.json index 013a9dacf3..b24546a8ec 100644 --- a/versions/c-/crashpad.json +++ b/versions/c-/crashpad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa3803e8f14e1a0467a2aa509403d9fc8c56e159", + "version-date": "2022-04-16", + "port-version": 1 + }, { "git-tree": "448abcac90e97d8b5ee03843775dd7fcba971979", "version-date": "2022-04-16",