diff options
| author | Alberto Mardegan <amardegan@luxoft.com> | 2018-05-01 22:49:13 +0300 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2018-07-03 15:39:03 -0700 |
| commit | 4fbe9f86104a1321e57998e3b37e2ca3c554a9c9 (patch) | |
| tree | 1e90927a712fe87e6aaccd6c883449bebe05d377 | |
| parent | 4ebdbe7e88ad93423e9d0d75eb066ecf8ab5fcad (diff) | |
| download | vcpkg-4fbe9f86104a1321e57998e3b37e2ca3c554a9c9.tar.gz vcpkg-4fbe9f86104a1321e57998e3b37e2ca3c554a9c9.zip | |
[botan] Update to 2.6.0
| -rw-r--r-- | ports/botan/0001-fix-crt-linking.patch | 56 | ||||
| -rw-r--r-- | ports/botan/CONTROL | 4 | ||||
| -rw-r--r-- | ports/botan/portfile.cmake | 7 |
3 files changed, 4 insertions, 63 deletions
diff --git a/ports/botan/0001-fix-crt-linking.patch b/ports/botan/0001-fix-crt-linking.patch deleted file mode 100644 index d1fdc2d70..000000000 --- a/ports/botan/0001-fix-crt-linking.patch +++ /dev/null @@ -1,56 +0,0 @@ -From b41cc93b63c99525e71291424466cdd45d92f770 Mon Sep 17 00:00:00 2001 -From: Mikhail Paulyshka <me@mixaill.tk> -Date: Sun, 12 Mar 2017 04:34:10 +0300 -Subject: [PATCH] fix CRT linking for static library for MSVC - ---- - configure.py | 15 +++++++++++++++ - src/build-data/cc/msvc.txt | 8 ++++++-- - 2 files changed, 21 insertions(+), 2 deletions(-) - -diff --git a/configure.py b/configure.py -index faf5120c5..9c545cf5f 100755 ---- a/configure.py -+++ b/configure.py -@@ -976,6 +976,21 @@ class CompilerInfo(object): - if flag != None and flag != '' and flag not in abi_link: - abi_link.append(flag) - -+ if options.build_shared_lib: -+ if options.with_debug_info: -+ if 'dynamic-debug' in self.mach_abi_linking: -+ abi_link.append(self.mach_abi_linking['dynamic-debug']) -+ else: -+ if 'dynamic' in self.mach_abi_linking: -+ abi_link.append(self.mach_abi_linking['dynamic']) -+ else: -+ if options.with_debug_info: -+ if 'static-debug' in self.mach_abi_linking: -+ abi_link.append(self.mach_abi_linking['static-debug']) -+ else: -+ if 'static' in self.mach_abi_linking: -+ abi_link.append(self.mach_abi_linking['static']) -+ - if options.with_coverage_info: - if self.coverage_flags == '': - raise ConfigureError('No coverage handling for %s' % (self.basename)) -diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt -index c1b820b91..e6182b0fa 100644 ---- a/src/build-data/cc/msvc.txt -+++ b/src/build-data/cc/msvc.txt -@@ -53,6 +53,10 @@ default-debug -> "$(LINKER) /DEBUG" - </binary_link_commands> - - <mach_abi_linking> --all -> "/MD /bigobj" --all-debug -> "/MDd /bigobj" -+all -> "/bigobj" -+all-debug -> "/bigobj" -+static -> "/MT" -+static-debug -> "/MTd" -+dynamic -> "/MD" -+dynamic-debug -> "/MDd" - </mach_abi_linking> --- -2.11.0.windows.1 - diff --git a/ports/botan/CONTROL b/ports/botan/CONTROL index 1ff010118..0f170b3f4 100644 --- a/ports/botan/CONTROL +++ b/ports/botan/CONTROL @@ -1,3 +1,3 @@ Source: botan -Version: 2.0.1 -Description: A cryptography library written in C++11
\ No newline at end of file +Version: 2.6.0 +Description: A cryptography library written in C++11 diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index a9a9ca547..fee0a0e2a 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -1,7 +1,7 @@ include(vcpkg_common_functions) -set(BOTAN_VERSION 2.0.1) -set(BOTAN_HASH c5062ce92a6e6e333b4e6af095ed54d0c4ffacefc6ac87ec651dd1e0937793c9956b7c9c0d3acf49f059505526584168364e01c55ab72c953ad255e8396aed35) +set(BOTAN_VERSION 2.6.0) +set(BOTAN_HASH 2082b4aaac0802f117a5f75c67a69e6d364b436a0ebe543032e370c3f085752bbe1ca48051462066e13bd42e47573ebc532d1d45074fe406df032f33346ee645) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/Botan-${BOTAN_VERSION}) vcpkg_download_distfile(ARCHIVE @@ -10,9 +10,6 @@ vcpkg_download_distfile(ARCHIVE SHA512 ${BOTAN_HASH} ) vcpkg_extract_source_archive(${ARCHIVE}) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-fix-crt-linking.patch") vcpkg_find_acquire_program(JOM) vcpkg_find_acquire_program(PYTHON3) |