Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

Fix error C2338 in botan

This commit is contained in:
Cheney-Wang 2018-07-10 03:35:30 -07:00
parent d977ac231e
commit 8eede5f97f
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/botan/CONTROL
View File

@ -1,3 +1,3 @@
Source: botan
Version: 2.6.0-1
Version: 2.6.0-2
Description: A cryptography library written in C++11

13
ports/botan/fix-C2338.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/cc/msvc.txt b/cc/msvc.txt
index ed32a3c..9e78fff 100644
--- a/cc/msvc.txt
+++ b/cc/msvc.txt
@@ -10,7 +10,7 @@ add_include_dir_option "/I"
add_lib_dir_option "/LIBPATH:"
add_lib_option ""
-compile_flags "/nologo /c"
+compile_flags "/nologo /c /D_ENABLE_EXTENDED_ALIGNED_STORAGE"
optimization_flags "/O2 /Oi"
size_optimization_flags "/O1 /Os"

6
ports/botan/portfile.cmake
View File

@ -11,6 +11,12 @@ vcpkg_download_distfile(ARCHIVE
)
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}/src/build-data
PATCHES
${CMAKE_CURRENT_LIST_DIR}/fix-C2338.patch
)
vcpkg_find_acquire_program(JOM)
vcpkg_find_acquire_program(PYTHON3)
get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)