Skip to content

[sentry-native] Fix linux runtime error and windows usage #39122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicroms merged 5 commits into from
Jun 7, 2024
Merged

[sentry-native] Fix linux runtime error and windows usage #39122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
24910e6
[sentry-native] Fix linux build error
Jun 4, 2024
e2b8ac9
update version
Jun 4, 2024
254405c
update patch
Jun 5, 2024
1f9bb26
Merge branch 'dev/Jon/sentry-native' of https://github.com/JonLiu1993…
Jun 5, 2024
42d8cfd
update version
Jun 5, 2024
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
26 changes: 26 additions & 0 deletions ports/sentry-native/fix-usage-runtime.patch
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8026,7 +8026,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
View file
Open in desktop
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