3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-31 05:03:22 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3983 from Cheney-W/UpdateBotan

Browse Source 
Update Botan to the latest commit
This commit is contained in:
Alexander Karatarakis 2018-07-31 12:51:18 -07:00 committed by GitHub
commit 9da52f6e76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 28 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-2
Version: 2.8.0
Description: A cryptography library written in C++11

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

@ -1,13 +0,0 @@
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"

21
ports/botan/portfile.cmake
View File

@ -1,20 +1,13 @@
include(vcpkg_common_functions)
set(BOTAN_VERSION 2.6.0)
set(BOTAN_HASH 2082b4aaac0802f117a5f75c67a69e6d364b436a0ebe543032e370c3f085752bbe1ca48051462066e13bd42e47573ebc532d1d45074fe406df032f33346ee645)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/Botan-${BOTAN_VERSION})
set(BOTAN_VERSION 2.8.0)
vcpkg_download_distfile(ARCHIVE
URLS "https://botan.randombit.net/releases/Botan-${BOTAN_VERSION}.tgz"
FILENAME "Botan-${BOTAN_VERSION}.tgz"
SHA512 ${BOTAN_HASH}
)
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}/src/build-data
PATCHES
${CMAKE_CURRENT_LIST_DIR}/fix-C2338.patch
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO randombit/botan
REF cb14e9ce95bcaae2ada7ffe96ef0cce6a2b38593
SHA512 3d8fbf1c65e2b0259f225db46ffa4a7eb989a518b230574e94f82dc13afd7dc32cfe6a8a0127e7dd0dea30e06f3946db78db50e107937382eff8ed823e996dc3
HEAD_REF master
)
vcpkg_find_acquire_program(JOM)