diff options
| author | JackBoosY <47264268+JackBoosY@users.noreply.github.com> | 2019-11-20 03:13:59 +0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2019-11-19 11:13:59 -0800 |
| commit | 892f584b346c789d3f86d13bf1557de5b3bd1db6 (patch) | |
| tree | 2f09b7e2187e13cd1a5bfbd407866604ada10859 | |
| parent | 7c412eb0442b0d633c5a3b82f2b9b130d7e53a2b (diff) | |
| download | vcpkg-892f584b346c789d3f86d13bf1557de5b3bd1db6.tar.gz vcpkg-892f584b346c789d3f86d13bf1557de5b3bd1db6.zip | |
[botan]Upgrade to 2.12.1 (#8844)
| -rw-r--r-- | ports/botan/CONTROL | 2 | ||||
| -rw-r--r-- | ports/botan/fix-generate-build-path.patch | 13 | ||||
| -rw-r--r-- | ports/botan/portfile.cmake | 15 |
3 files changed, 23 insertions, 7 deletions
diff --git a/ports/botan/CONTROL b/ports/botan/CONTROL index e96ef2ff5..11ac954f8 100644 --- a/ports/botan/CONTROL +++ b/ports/botan/CONTROL @@ -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 diff --git a/ports/botan/fix-generate-build-path.patch b/ports/botan/fix-generate-build-path.patch new file mode 100644 index 000000000..11c3dc0af --- /dev/null +++ b/ports/botan/fix-generate-build-path.patch @@ -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'),
diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index 170b399ce..f77c315b4 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -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) @@ -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}) |