mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-18 13:13:34 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[botan]Upgrade to 2.12.1 (#8844)

Browse Source
This commit is contained in:
JackBoosY 2019-11-20 03:13:59 +08:00 committed by Robert Schumacher
parent 7c412eb044
commit 892f584b34
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/botan/CONTROL
View File

@ -1,4 +1,4 @@
Source: botan Source: botan
Version: 2.11.0 Version: 2.12.1
Homepage: https://botan.randombit.net Homepage: https://botan.randombit.net
Description: A cryptography library written in C++11 Description: A cryptography library written in C++11

13
ports/botan/fix-generate-build-path.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/configure.py b/configure.py
index 00baa0c..cfec5bb 100644
--- a/configure.py
+++ b/configure.py
@@ -2035,7 +2035,7 @@ def create_template_vars(source_paths, build_paths, options, modules, cc, arch,
'maintainer_mode': options.maintainer_mode,
'out_dir': build_dir,
- 'build_dir': build_paths.build_dir,
+ 'build_dir': os.path.abspath(build_paths.build_dir),
'doc_stamp_file': os.path.join(build_paths.build_dir, 'doc.stamp'),
'makefile_path': os.path.join(build_paths.build_dir, '..', 'Makefile'),

15
ports/botan/portfile.cmake
View File

@ -1,13 +1,12 @@
include(vcpkg_common_functions) set(BOTAN_VERSION 2.12.1)
set(BOTAN_VERSION 2.11.0)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO randombit/botan REPO randombit/botan
REF 16a726c3ad10316bd8d37b6118a5cc52894e8e8f REF 1a6ad661ce64287ccbe26460ccc3aa4247d86ba8 # 2.12.1
SHA512 3d759fb262d65f7d325a1e888f74cb1c372ef687b0fcc6fc6ba041b83e3dc65c2928b343c65a89e73ea00c09d11cdda3a161ca98dbabe426903c4cbaf030767c SHA512 7a774f325c85761e2d076847f1fc8bc67592d696c4ebde839928591f7c85352e2df6032c122bdcc603adf84d76f5a1897c7118aa3859d38f79e474f27bc3b588
HEAD_REF master HEAD_REF master
PATCHES fix-generate-build-path.patch
) )
if(CMAKE_HOST_WIN32) if(CMAKE_HOST_WIN32)
@ -95,7 +94,11 @@ function(BOTAN_BUILD BOTAN_BUILD_TYPE)
vcpkg_execute_required_process( vcpkg_execute_required_process(
COMMAND "${PYTHON3}" "${SOURCE_PATH}/src/scripts/install.py" COMMAND "${PYTHON3}" "${SOURCE_PATH}/src/scripts/install.py"
--prefix=${BOTAN_FLAG_PREFIX} --prefix=${BOTAN_FLAG_PREFIX}
--docdir=share --bindir=${BOTAN_FLAG_PREFIX}/bin
--libdir=${BOTAN_FLAG_PREFIX}/lib
--pkgconfigdir=${BOTAN_FLAG_PREFIX}/lib
--includedir=${BOTAN_FLAG_PREFIX}/include
--docdir=${BOTAN_FLAG_PREFIX}/share
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}" WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}"
LOGNAME install-${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}) LOGNAME install-${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE})