Skip to content

Commit

Permalink
[sentry-native] Fix linux runtime error and windows usage (#39122)
Browse files Browse the repository at this point in the history
Co-authored-by: Jon <[email protected]>
  • Loading branch information
JonLiu1993 and Jon authored Jun 7, 2024
1 parent 47dcaa2 commit 1fcea05
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 1 deletion.
26 changes: 26 additions & 0 deletions ports/sentry-native/fix-usage-runtime.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
diff --git a/external/crashpad/handler/CMakeLists.txt b/external/crashpad/handler/CMakeLists.txt
index be0e544..b0d44af 100644
--- a/external/crashpad/handler/CMakeLists.txt
+++ b/external/crashpad/handler/CMakeLists.txt
@@ -89,7 +89,7 @@ if(NOT IOS)
main.cc
)

- if(LINUX)
+ if(LINUX AND BUILD_SHARED_LIBS)
target_sources(crashpad_handler PRIVATE
../client/pthread_create_linux.cc
)
diff --git a/sentry-config.cmake.in b/sentry-config.cmake.in
index 8840f5d..af3e84c 100644
--- a/sentry-config.cmake.in
+++ b/sentry-config.cmake.in
@@ -9,7 +9,7 @@ set(SENTRY_LINK_PTHREAD @SENTRY_LINK_PTHREAD@)

if(SENTRY_BACKEND STREQUAL "crashpad" AND NOT SENTRY_BUILD_SHARED_LIBS)
include("${CMAKE_CURRENT_LIST_DIR}/sentry_crashpad-targets.cmake")
- if(NOT MSVC AND NOT SENTRY_BUILD_SHARED_LIBS)
+ if(NOT SENTRY_BUILD_SHARED_LIBS)
find_dependency(ZLIB)
endif()
endif()
1 change: 1 addition & 0 deletions ports/sentry-native/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ vcpkg_extract_source_archive(
PATCHES
fix-config-cmake.patch
fix-crashpad-wer.patch
fix-usage-runtime.patch
)
file(REMOVE_RECURSE "${SOURCE_PATH}/external/crashpad/third_party/zlib/zlib")

Expand Down
1 change: 1 addition & 0 deletions ports/sentry-native/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "sentry-native",
"version": "0.7.5",
"port-version": 1,
"description": "Sentry SDK for C, C++ and native applications.",
"homepage": "https://sentry.io/",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -8038,7 +8038,7 @@
},
"sentry-native": {
"baseline": "0.7.5",
"port-version": 0
"port-version": 1
},
"septag-dmon": {
"baseline": "2022-02-08",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/sentry-native.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b7ec5e8b622f2026bb79fd536c893742ff48afa0",
"version": "0.7.5",
"port-version": 1
},
{
"git-tree": "83ff49b00c2fd8159701cc2f8489a10a6959227c",
"version": "0.7.5",
Expand Down

0 comments on commit 1fcea05

Please sign in to comment.