Skip to content

[botan] Fix debug info #22911

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
BillyONeal merged 3 commits into from
Feb 4, 2022
Merged

[botan] Fix debug info #22911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1c2f7e
[botan] Fix debug info
gix Feb 3, 2022
a3776fc
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Feb 4, 2022
4113aba
Fix version database.
BillyONeal Feb 4, 2022
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
17 changes: 17 additions & 0 deletions ports/botan/embed-debug-info.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt
index 2306a4485..977e2e958 100644
--- a/src/build-data/cc/msvc.txt
+++ b/src/build-data/cc/msvc.txt
@@ -17,10 +17,10 @@ optimization_flags "/O2 /Oi"
size_optimization_flags "/O1 /Os"

# for debug info in the object file:
-#debug_info_flags "/Z7"
+debug_info_flags "/Z7"

# for using a PDB file:
-debug_info_flags "/Zi /FS"
+#debug_info_flags "/Zi /FS"

preproc_flags "/nologo /EP"

8 changes: 7 additions & 1 deletion ports/botan/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
fix-generate-build-path.patch
embed-debug-info.patch
)

if(CMAKE_HOST_WIN32)
Expand Down Expand Up @@ -80,11 +81,16 @@ function(BOTAN_BUILD BOTAN_BUILD_TYPE)
"--distribution-info=vcpkg ${TARGET_TRIPLET}"
--prefix=${BOTAN_FLAG_PREFIX}
--with-pkg-config
--link-method=copy)
--link-method=copy
--with-debug-info)
if(CMAKE_HOST_WIN32)
list(APPEND configure_arguments ${BOTAN_MSVC_RUNTIME}${BOTAN_MSVC_RUNTIME_SUFFIX})
endif()

if(VCPKG_CXX_FLAGS)
list(APPEND configure_arguments --extra-cxxflags ${VCPKG_CXX_FLAGS})
endif()

if("-DBOTAN_AMALGAMATION=ON" IN_LIST FEATURE_OPTIONS)
list(APPEND configure_arguments --amalgamation)
endif()
Expand Down
2 changes: 1 addition & 1 deletion ports/botan/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "botan",
"version": "2.18.1",
"port-version": 7,
"port-version": 8,
"description": "A cryptography library written in C++11",
"homepage": "https://botan.randombit.net",
"license": "BSD-2-Clause",
Expand Down
5 changes: 5 additions & 0 deletions versions/b-/botan.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "267c31f3759881d233529d28ec78e2a0c8d1e9b4",
"version": "2.18.1",
"port-version": 8
},
{
"git-tree": "dfbd885e94b11d3b8074d96c92e810a0f1a7be7a",
"version": "2.18.1",
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 @@ -1126,7 +1126,7 @@
},
"botan": {
"baseline": "2.18.1",
"port-version": 7
"port-version": 8
},
"box2d": {
"baseline": "2.4.1",
Expand Down