mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 22:01:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[boost-stacktrace] Fix default-feature backtrace on arm64-osx-dynamic (#41249)

Browse Source 
Co-authored-by: Monica <v-liumonica@microsoft.com>
Co-authored-by: Javier Matos <javiermatos@Javiers-Laptop.local>
This commit is contained in:
MonicaLiu 2024-10-03 14:51:33 +00:00 committed by GitHub
parent 86a181505a
commit eb36f47a55
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ports/boost-stacktrace/fix_config-check.diff
View File

@ -20,3 +20,17 @@ index 1cb895570d..4638618d56 100644
option(BOOST_STACKTRACE_ENABLE_NOOP "Boost.Stacktrace: build boost_stacktrace_noop" ON)
option(BOOST_STACKTRACE_ENABLE_BACKTRACE "Boost.Stacktrace: build boost_stacktrace_backtrace" ${BOOST_STACKTRACE_HAS_BACKTRACE})
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,7 +90,10 @@ message(STATUS "Boost.Stacktrace: "
)
stacktrace_add_library(noop ${BOOST_STACKTRACE_ENABLE_NOOP} "" "")
-stacktrace_add_library(backtrace ${BOOST_STACKTRACE_ENABLE_BACKTRACE} "backtrace" "")
+if(BOOST_STACKTRACE_ENABLE_BACKTRACE)
+ find_library(BACKTRACE_LIBRARY_PATH NAMES backtrace REQUIRED)
+ stacktrace_add_library(backtrace ${BOOST_STACKTRACE_ENABLE_BACKTRACE} ${BACKTRACE_LIBRARY_PATH} "")
+endif()
stacktrace_add_library(addr2line ${BOOST_STACKTRACE_ENABLE_ADDR2LINE} "" "")
stacktrace_add_library(basic ${BOOST_STACKTRACE_ENABLE_BASIC} "" "")
stacktrace_add_library(windbg ${BOOST_STACKTRACE_ENABLE_WINDBG} "dbgeng;ole32" "_GNU_SOURCE=1")

2
ports/boost-stacktrace/vcpkg.json
View File

@ -2,7 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-stacktrace",
"version": "1.85.0",
"port-version": 3,
"port-version": 4,
"description": "Boost stacktrace module",
"homepage": "https://www.boost.org/libs/stacktrace",
"license": "BSL-1.0",

2
scripts/boost/generate-ports.ps1
View File

@ -56,7 +56,7 @@ $portVersions = @{
'boost-program-options' = 2
'boost-python' = 2
'boost-redis' = 2
'boost-stacktrace' = 3
'boost-stacktrace' = 4
'boost-timer' = 2
'boost-unordered' = 2
'boost-variant2' = 2

5
versions/b-/boost-stacktrace.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "71c30d63b239bf520a583d4da9ceb17770bbc776",
"version": "1.85.0",
"port-version": 4
},
{
"git-tree": "a81aa3960c8e5eb5c5d3dbc77ba97b830c89667c",
"version": "1.85.0",

2
versions/baseline.json
View File

@ -1238,7 +1238,7 @@
},
"boost-stacktrace": {
"baseline": "1.85.0",
"port-version": 3
"port-version": 4
},
"boost-statechart": {
"baseline": "1.85.0",