diff --git a/ports/sentry-native/fix-usage-runtime.patch b/ports/sentry-native/fix-usage-runtime.patch new file mode 100644 index 00000000000000..96a1e7bbbb76d6 --- /dev/null +++ b/ports/sentry-native/fix-usage-runtime.patch @@ -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() diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index 1e283420c39576..5e7b3641aa0f8d 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -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") diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index 95d3e8ea550945..7b7d281b282f5c 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -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", diff --git a/versions/baseline.json b/versions/baseline.json index 9434491417c910..3e27be8d69ca25 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8038,7 +8038,7 @@ }, "sentry-native": { "baseline": "0.7.5", - "port-version": 0 + "port-version": 1 }, "septag-dmon": { "baseline": "2022-02-08", diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index 0bde3d3befe225..97161fe9aa20ef 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b7ec5e8b622f2026bb79fd536c893742ff48afa0", + "version": "0.7.5", + "port-version": 1 + }, { "git-tree": "83ff49b00c2fd8159701cc2f8489a10a6959227c", "version": "0.7.5",