diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-09-27 17:41:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-27 17:41:18 -0700 |
| commit | 7a05bde0a6872709333cfdff71ff6eedb0f89963 (patch) | |
| tree | 2799b82c689845b4c7a89eafdb9e9063c1ecc21f /ports/botan | |
| parent | d0511fbd55629a078b10243b23ab1a7301fb54cf (diff) | |
| download | vcpkg-7a05bde0a6872709333cfdff71ff6eedb0f89963.tar.gz vcpkg-7a05bde0a6872709333cfdff71ff6eedb0f89963.zip | |
[asmjit][botan][brotli] Update version (#13676)
Diffstat (limited to 'ports/botan')
| -rw-r--r-- | ports/botan/CONTROL | 2 | ||||
| -rw-r--r-- | ports/botan/fix-msvc-build.patch | 17 | ||||
| -rw-r--r-- | ports/botan/portfile.cmake | 11 |
3 files changed, 4 insertions, 26 deletions
diff --git a/ports/botan/CONTROL b/ports/botan/CONTROL index e38a27bbb..871381e57 100644 --- a/ports/botan/CONTROL +++ b/ports/botan/CONTROL @@ -1,4 +1,4 @@ Source: botan -Version: 2.12.1-1 +Version: 2.15.0 Homepage: https://botan.randombit.net Description: A cryptography library written in C++11 diff --git a/ports/botan/fix-msvc-build.patch b/ports/botan/fix-msvc-build.patch deleted file mode 100644 index a884b621d..000000000 --- a/ports/botan/fix-msvc-build.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/configure.py b/configure.py -index cfec5bb..0fad6ce 100644 ---- a/configure.py -+++ b/configure.py -@@ -2146,6 +2146,12 @@ def create_template_vars(source_paths, build_paths, options, modules, cc, arch, - - 'mod_list': sorted([m.basename for m in modules]) - } -+ -+ if cc.basename == 'msvc' and variables['cxx_abi_flags'] != '': -+ # MSVC linker doesn't support/need the ABI options, -+ # just transfer them over to just the compiler invocations -+ variables['cc_compile_flags'] = '%s %s' % (variables['cxx_abi_flags'], variables['cc_compile_flags']) -+ variables['cxx_abi_flags'] = '' - - variables['lib_flags'] = cc.gen_lib_flags(options, variables) - variables['cmake_lib_flags'] = cmake_escape(variables['lib_flags']) diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index 7343046b4..a00253e3f 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -1,14 +1,13 @@ -set(BOTAN_VERSION 2.12.1) +set(BOTAN_VERSION 2.15.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO randombit/botan - REF 1a6ad661ce64287ccbe26460ccc3aa4247d86ba8 # 2.12.1 - SHA512 7a774f325c85761e2d076847f1fc8bc67592d696c4ebde839928591f7c85352e2df6032c122bdcc603adf84d76f5a1897c7118aa3859d38f79e474f27bc3b588 + REF 3ed6eaa3c1236aed844f5475e2df8b89b3286ac4 # 2.15.0 + SHA512 a5c76e22f1ad8455ed5dab7c1dff2dd21e8a6e720e024144fe117982fd3b8815e8200844f6fd3abf8326fa4b18d2598c724f7ad5752c517d4b8fab83fb1b5907 HEAD_REF master PATCHES fix-generate-build-path.patch - fix-msvc-build.patch # Remove this patch on next update ) if(CMAKE_HOST_WIN32) @@ -104,10 +103,6 @@ function(BOTAN_BUILD BOTAN_BUILD_TYPE) WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}" LOGNAME install-${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}) - if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic AND CMAKE_HOST_WIN32) - file(RENAME ${BOTAN_FLAG_PREFIX}/lib/botan${BOTAN_DEBUG_SUFFIX}.dll ${BOTAN_FLAG_PREFIX}/bin/botan${BOTAN_DEBUG_SUFFIX}.dll) - endif() - message(STATUS "Package ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE} done") endfunction() |