diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-07-11 17:23:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-11 17:23:04 -0700 |
| commit | 6cd36321ccd15e57fddccef2caaeb9cb240a6144 (patch) | |
| tree | d104e41239b507c2e7467e435d6e0696f0921c54 | |
| parent | b1b945448c593dcca3e91db592a68babf2fcf65c (diff) | |
| parent | 8eede5f97f85cd99f663ccd85e9c44819e21f05e (diff) | |
| download | vcpkg-6cd36321ccd15e57fddccef2caaeb9cb240a6144.tar.gz vcpkg-6cd36321ccd15e57fddccef2caaeb9cb240a6144.zip | |
Merge pull request #3877 from Cheney-W/FixBotan
Fix error C2338 in botan
| -rw-r--r-- | ports/botan/CONTROL | 2 | ||||
| -rw-r--r-- | ports/botan/fix-C2338.patch | 13 | ||||
| -rw-r--r-- | ports/botan/portfile.cmake | 6 |
3 files changed, 20 insertions, 1 deletions
diff --git a/ports/botan/CONTROL b/ports/botan/CONTROL index 0f34f1bcd..33e47b7e8 100644 --- a/ports/botan/CONTROL +++ b/ports/botan/CONTROL @@ -1,3 +1,3 @@ Source: botan -Version: 2.6.0-1 +Version: 2.6.0-2 Description: A cryptography library written in C++11 diff --git a/ports/botan/fix-C2338.patch b/ports/botan/fix-C2338.patch new file mode 100644 index 000000000..9ef3bbd45 --- /dev/null +++ b/ports/botan/fix-C2338.patch @@ -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"
diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index 272679019..60e8e7fd6 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -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) |