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
9 changes: 2 additions & 7 deletions external/vcpkg-overlays/crashpad/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
This overlay of crashpad is based on the crashpad port found in vcpkg 2025.08.27.

The only thing it adds is a new patch applied to `mini_chromium` to fix finding VS build tools.

Changes:
- Add patch in `fix-find-vs-build-tools.patch`
- Modify `portfile.cmake` to add `fix-find-vs-build-tools.patch` to the `PATCHES` section for the `vcpkg_from_git` checking out mini_chromium
This overlay updates crashpad to a newer version.
Ideally this should be upstreamed to the vcpkg repository.
13 changes: 0 additions & 13 deletions external/vcpkg-overlays/crashpad/fix-find-vs-build-tools.patch

This file was deleted.

24 changes: 12 additions & 12 deletions external/vcpkg-overlays/crashpad/fix-lib-name-conflict-1.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 0bcf519..c637f2b 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -5,6 +5,7 @@
import("../build/platform.gni")
static_library("base") {
+ output_name = "vcpkg_crashpad_base"
sources = [
"atomicops.h",
"atomicops_internals_atomicword_compat.h",
diff --git a/base/BUILD.gn b/base/BUILD.gn
index ba6f6e5..41eca91 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -5,6 +5,7 @@
import("../build/platform.gni")

static_library("base") {
+ output_name = "vcpkg_crashpad_base"
sources = [
"atomicops.h",
"atomicops_internals_atomicword_compat.h",
18 changes: 9 additions & 9 deletions external/vcpkg-overlays/crashpad/fix-lib-name-conflict.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/client/BUILD.gn b/client/BUILD.gn
index bd150ab..5cbf469 100644
index e57e0e0c..ac64561f 100644
--- a/client/BUILD.gn
+++ b/client/BUILD.gn
@@ -15,6 +15,7 @@
Expand All @@ -10,7 +10,7 @@ index bd150ab..5cbf469 100644
sources = [
"crashpad_client.h",
"prune_crash_reports.cc",
@@ -114,6 +115,7 @@ crashpad_static_library("client") {
@@ -125,6 +126,7 @@ crashpad_static_library("client") {
}

static_library("common") {
Expand All @@ -19,22 +19,22 @@ index bd150ab..5cbf469 100644
"annotation.cc",
"annotation.h",
diff --git a/handler/BUILD.gn b/handler/BUILD.gn
index a2d6f7f..70a997e 100644
index 9061c2cb..5fea7566 100644
--- a/handler/BUILD.gn
+++ b/handler/BUILD.gn
@@ -94,6 +94,7 @@ if (crashpad_is_android) {
}
@@ -15,6 +15,7 @@
import("../build/crashpad_buildconfig.gni")

static_library("common") {
+ output_name = "vcpkg_crashpad_handler_common"
sources = [
"crash_report_upload_thread.cc",
"crash_report_upload_thread.h",
"crash_report_upload_rate_limit.cc",
"crash_report_upload_rate_limit.h",
diff --git a/util/BUILD.gn b/util/BUILD.gn
index e7ff4a8..9efcb41 100644
index ca817736..20972a22 100644
--- a/util/BUILD.gn
+++ b/util/BUILD.gn
@@ -167,6 +167,7 @@ if (crashpad_is_win) {
@@ -173,6 +173,7 @@ if (crashpad_is_win) {
}

crashpad_static_library("util") {
Expand Down
14 changes: 0 additions & 14 deletions external/vcpkg-overlays/crashpad/fix-linux.patch

This file was deleted.

18 changes: 0 additions & 18 deletions external/vcpkg-overlays/crashpad/fix-std-20.patch

This file was deleted.

18 changes: 18 additions & 0 deletions external/vcpkg-overlays/crashpad/fix-windows-toolchain.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
diff --git a/build/compiler.gni b/build/compiler.gni
index 7e2b3ce..ddaffc8 100644
--- a/build/compiler.gni
+++ b/build/compiler.gni
@@ -4,12 +4,4 @@

import("platform.gni")

-if (mini_chromium_is_win) {
- declare_args() {
- mini_chromium_is_clang = mini_chromium_is_posix ||
- mini_chromium_is_fuchsia || mini_chromium_is_win
- }
-} else {
- mini_chromium_is_clang =
- mini_chromium_is_posix || mini_chromium_is_fuchsia || mini_chromium_is_win
-}
+mini_chromium_is_clang = mini_chromium_is_posix || mini_chromium_is_fuchsia
Loading
Loading