diff options
| author | Martin Vejdarski <extrulm@gmail.com> | 2021-06-03 21:53:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-03 12:53:54 -0700 |
| commit | 5f32a49551c6101d294c7e73806999abab806570 (patch) | |
| tree | 865ab2cfb9f6210ce7e60cd2c1cba91833147fca | |
| parent | d97e15975af59c9cde44d418952785ff71fa110e (diff) | |
| download | vcpkg-5f32a49551c6101d294c7e73806999abab806570.tar.gz vcpkg-5f32a49551c6101d294c7e73806999abab806570.zip | |
[sentry-native] Enable arm64 on macOS (#18184)
* [sentry-native] Enable arm64 on macOS
* [sentry-native] x-add-version
* [sentry-native] Fix build issue with libcurl and crashpad for *-osx-dynamic
* [sentry-native] x-add-version
| -rw-r--r-- | ports/sentry-native/fix-libcurl.patch | 19 | ||||
| -rw-r--r-- | ports/sentry-native/portfile.cmake | 7 | ||||
| -rw-r--r-- | ports/sentry-native/vcpkg.json | 3 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/s-/sentry-native.json | 5 |
5 files changed, 32 insertions, 4 deletions
diff --git a/ports/sentry-native/fix-libcurl.patch b/ports/sentry-native/fix-libcurl.patch new file mode 100644 index 000000000..4ecba9666 --- /dev/null +++ b/ports/sentry-native/fix-libcurl.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8a74a93..30c131c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -249,13 +249,7 @@ target_compile_definitions(sentry PRIVATE SIZEOF_LONG=${CMAKE_SIZEOF_LONG}) + + if(SENTRY_TRANSPORT_CURL) + find_package(CURL REQUIRED) +- target_include_directories(sentry PRIVATE ${CURL_INCLUDE_DIR}) +- # The exported sentry target must not contain any path of the build machine, therefore use generator expressions +- # FIXME: cmake 3.12 introduced the target CURL::libcurl +- string(REPLACE ";" "$<SEMICOLON>" GENEX_CURL_LIBRARIES "${CURL_LIBRARIES}") +- string(REPLACE ";" "$<SEMICOLON>" GENEX_CURL_COMPILE_DEFINITIONS "${CURL_COMPILE_DEFINITIONS}") +- target_link_libraries(sentry PRIVATE $<BUILD_INTERFACE:${GENEX_CURL_LIBRARIES}>) +- target_compile_definitions(sentry PRIVATE $<BUILD_INTERFACE:${GENEX_CURL_COMPILE_DEFINITIONS}>) ++ target_link_libraries(sentry PRIVATE CURL::libcurl) + endif() + + set_property(TARGET sentry PROPERTY C_VISIBILITY_PRESET hidden) diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index 4d073e0aa..706d212d2 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -1,4 +1,6 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP")
+if(NOT VCPKG_TARGET_IS_OSX)
+ vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP")
+endif()
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.9/sentry-native.zip"
@@ -13,6 +15,7 @@ vcpkg_extract_source_archive_ex( PATCHES
fix-warningC5105.patch
fix-config-cmake.patch
+ fix-libcurl.patch
)
if (NOT DEFINED SENTRY_BACKEND)
@@ -44,7 +47,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sentry TARGET_PATH share/sentry)
-if (WIN32 AND SENTRY_BACKEND STREQUAL "crashpad")
+if (SENTRY_BACKEND STREQUAL "crashpad")
vcpkg_copy_tools(
TOOL_NAMES crashpad_handler
AUTO_CLEAN
diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index fb53a5b4b..cca64cbfb 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,9 +1,10 @@ { "name": "sentry-native", "version-semver": "0.4.9", + "port-version": 1, "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", - "supports": "!(arm | arm64 | uwp)", + "supports": "!(arm | (arm64 & !osx) | uwp)", "dependencies": [ { "name": "curl", diff --git a/versions/baseline.json b/versions/baseline.json index cbafbfacb..7004eb245 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5674,7 +5674,7 @@ }, "sentry-native": { "baseline": "0.4.9", - "port-version": 0 + "port-version": 1 }, "septag-sx": { "baseline": "2019-05-07-2", diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index 0e7f38455..f85102c8e 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "8200b5e337c4e6074c67a6a2398fa7bbbb3c2e4b", + "version-semver": "0.4.9", + "port-version": 1 + }, + { "git-tree": "17febc7e743aa5a91308dd2afd46cec3ef4a6c36", "version-semver": "0.4.9", "port-version": 0 |