Skip to content

[botan]Upgrade to 2.12.1 #8844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 19, 2019
Merged

[botan]Upgrade to 2.12.1 #8844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/botan/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: botan
Version: 2.11.0
Version: 2.12.1
Homepage: https://botan.randombit.net
Description: A cryptography library written in C++11
13 changes: 13 additions & 0 deletions ports/botan/fix-generate-build-path.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 9 additions & 6 deletions ports/botan/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
include(vcpkg_common_functions)

set(BOTAN_VERSION 2.11.0)
set(BOTAN_VERSION 2.12.1)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO randombit/botan
REF 16a726c3ad10316bd8d37b6118a5cc52894e8e8f
SHA512 3d759fb262d65f7d325a1e888f74cb1c372ef687b0fcc6fc6ba041b83e3dc65c2928b343c65a89e73ea00c09d11cdda3a161ca98dbabe426903c4cbaf030767c
REF 1a6ad661ce64287ccbe26460ccc3aa4247d86ba8 # 2.12.1
SHA512 7a774f325c85761e2d076847f1fc8bc67592d696c4ebde839928591f7c85352e2df6032c122bdcc603adf84d76f5a1897c7118aa3859d38f79e474f27bc3b588
HEAD_REF master
PATCHES fix-generate-build-path.patch
)

if(CMAKE_HOST_WIN32)
Expand Down Expand Up @@ -95,7 +94,11 @@ function(BOTAN_BUILD BOTAN_BUILD_TYPE)
vcpkg_execute_required_process(
COMMAND "${PYTHON3}" "${SOURCE_PATH}/src/scripts/install.py"
--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}"
LOGNAME install-${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE})

Expand Down